undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck: accept an oid instead of a "struct blob" for fsck_blob()

Browse Source 
We don't actually need any information from the object struct except its
oid (and the type, of course, but that's implicitly OBJ_BLOB). This
gives our callers more flexibility to drop the object structs, too.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2019-10-18 00:59:29 -04:00 committed by Junio C Hamano
parent 38370253fd
commit 6da40b22ca
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fsck.c
View File

@ -890,7 +890,7 @@ done:
} }
struct fsck_gitmodules_data { struct fsck_gitmodules_data {
struct object *obj; const struct object_id *oid;
struct fsck_options *options; struct fsck_options *options;
int ret; int ret;
}; };
@ -909,21 +909,21 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
name = xmemdupz(subsection, subsection_len); name = xmemdupz(subsection, subsection_len);
if (check_submodule_name(name) < 0) if (check_submodule_name(name) < 0)
data->ret |= report(data->options, data->ret |= report(data->options,
&data->obj->oid, data->obj->type, data->oid, OBJ_BLOB,
FSCK_MSG_GITMODULES_NAME, FSCK_MSG_GITMODULES_NAME,
"disallowed submodule name: %s", "disallowed submodule name: %s",
name); name);
if (!strcmp(key, "url") && value && if (!strcmp(key, "url") && value &&
looks_like_command_line_option(value)) looks_like_command_line_option(value))
data->ret |= report(data->options, data->ret |= report(data->options,
&data->obj->oid, data->obj->type, data->oid, OBJ_BLOB,
FSCK_MSG_GITMODULES_URL, FSCK_MSG_GITMODULES_URL,
"disallowed submodule url: %s", "disallowed submodule url: %s",
value); value);
if (!strcmp(key, "path") && value && if (!strcmp(key, "path") && value &&
looks_like_command_line_option(value)) looks_like_command_line_option(value))
data->ret |= report(data->options, data->ret |= report(data->options,
&data->obj->oid, data->obj->type, data->oid, OBJ_BLOB,
FSCK_MSG_GITMODULES_PATH, FSCK_MSG_GITMODULES_PATH,
"disallowed submodule path: %s", "disallowed submodule path: %s",
value); value);
@ -932,17 +932,17 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
return 0; return 0;
} }
static int fsck_blob(struct blob *blob, const char *buf, static int fsck_blob(const struct object_id *oid, const char *buf,
unsigned long size, struct fsck_options *options) unsigned long size, struct fsck_options *options)
{ {
struct fsck_gitmodules_data data; struct fsck_gitmodules_data data;
struct config_options config_opts = { 0 }; struct config_options config_opts = { 0 };
if (!oidset_contains(&gitmodules_found, &blob->object.oid)) if (!oidset_contains(&gitmodules_found, oid))
return 0; return 0;
oidset_insert(&gitmodules_done, &blob->object.oid); oidset_insert(&gitmodules_done, oid);
if (object_on_skiplist(options, &blob->object.oid)) if (object_on_skiplist(options, oid))
return 0; return 0;
if (!buf) { if (!buf) {
@ -951,18 +951,18 @@ static int fsck_blob(struct blob *blob, const char *buf,
* blob too gigantic to load into memory. Let's just consider * blob too gigantic to load into memory. Let's just consider
* that an error. * that an error.
*/ */
return report(options, &blob->object.oid, blob->object.type, return report(options, oid, OBJ_BLOB,
FSCK_MSG_GITMODULES_LARGE, FSCK_MSG_GITMODULES_LARGE,
".gitmodules too large to parse"); ".gitmodules too large to parse");
} }
data.obj = &blob->object; data.oid = oid;
data.options = options; data.options = options;
data.ret = 0; data.ret = 0;
config_opts.error_action = CONFIG_ERROR_SILENT; config_opts.error_action = CONFIG_ERROR_SILENT;
if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB, if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,
".gitmodules", buf, size, &data, &config_opts)) ".gitmodules", buf, size, &data, &config_opts))
data.ret |= report(options, &blob->object.oid, blob->object.type, data.ret |= report(options, oid, OBJ_BLOB,
FSCK_MSG_GITMODULES_PARSE, FSCK_MSG_GITMODULES_PARSE,
"could not parse gitmodules blob"); "could not parse gitmodules blob");
@ -976,7 +976,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
return report(options, NULL, OBJ_NONE, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck"); return report(options, NULL, OBJ_NONE, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck");
if (obj->type == OBJ_BLOB) if (obj->type == OBJ_BLOB)
return fsck_blob((struct blob *)obj, data, size, options); return fsck_blob(&obj->oid, data, size, options);
if (obj->type == OBJ_TREE) if (obj->type == OBJ_TREE)
return fsck_tree((struct tree *) obj, data, size, options); return fsck_tree((struct tree *) obj, data, size, options);
if (obj->type == OBJ_COMMIT) if (obj->type == OBJ_COMMIT)
@ -1042,7 +1042,7 @@ int fsck_finish(struct fsck_options *options)
} }
if (type == OBJ_BLOB) if (type == OBJ_BLOB)
ret |= fsck_blob(blob, buf, size, options); ret |= fsck_blob(&blob->object.oid, buf, size, options);
else else
ret |= report(options, ret |= report(options,
&blob->object.oid, blob->object.type, &blob->object.oid, blob->object.type,