Skip to content

Commit

Permalink
fsck: drop unused parameter from traverse_one_object()
Browse files Browse the repository at this point in the history
Also add comments to seemingly unsafe pointer dereferences, that
are all safe.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jan 27, 2011
1 parent d2d434b commit a1cdc25
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions builtin/fsck.c
Expand Up @@ -74,7 +74,13 @@ static int mark_object(struct object *obj, int type, void *data)
{
struct object *parent = data;

/*
* The only case data is NULL or type is OBJ_ANY is when
* mark_object_reachable() calls us. All the callers of
* that function has non-NULL obj hence ...
*/
if (!obj) {
/* ... these references to parent->fld are safe here */
printf("broken link from %7s %s\n",
typename(parent->type), sha1_to_hex(parent->sha1));
printf("broken link from %7s %s\n",
Expand All @@ -84,6 +90,7 @@ static int mark_object(struct object *obj, int type, void *data)
}

if (type != OBJ_ANY && obj->type != type)
/* ... and the reference to parent is safe here */
objerror(parent, "wrong object type in link");

if (obj->flags & REACHABLE)
Expand All @@ -109,7 +116,7 @@ static void mark_object_reachable(struct object *obj)
mark_object(obj, OBJ_ANY, NULL);
}

static int traverse_one_object(struct object *obj, struct object *parent)
static int traverse_one_object(struct object *obj)
{
int result;
struct tree *tree = NULL;
Expand Down Expand Up @@ -138,7 +145,7 @@ static int traverse_reachable(void)
entry = pending.objects + --pending.nr;
obj = entry->item;
parent = (struct object *) entry->name;
result |= traverse_one_object(obj, parent);
result |= traverse_one_object(obj);
}
return !!result;
}
Expand Down Expand Up @@ -556,8 +563,8 @@ static int fsck_cache_tree(struct cache_tree *it)
sha1_to_hex(it->sha1));
return 1;
}
mark_object_reachable(obj);
obj->used = 1;
mark_object_reachable(obj);
if (obj->type != OBJ_TREE)
err |= objerror(obj, "non-tree in cache-tree");
}
Expand Down

0 comments on commit a1cdc25

Please sign in to comment.