kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/fsck: merge `fsck_obj_buffer()` and `fsck_obj()` 

The interfaces of the functions `fsck_obj()` and `fsck_obj_buffer()` are
somewhat similar to one another. The only difference between those two
is that `fsck_obj()` takes an already-parsed object as input, whereas
`fsck_obj_buffer()` parses the buffer and then calls `fsck_obj()`.

Furthermore, `fsck_obj()` has no callers other than `fsck_obj_buffer()`.

Refactor the code by merging those two functions. This makes it obvious
which function does what, and it allows us to get rid of the early
return in `fsck_obj()` in case `SEEN` is set as the only caller
unconditionally clears that bit before calling it anyway.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
jch
Patrick Steinhardt 2026-08-31 08:46:16 +02:00 committed by Junio C Hamano
parent 68c869769e
commit c711a2cfa5
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
builtin/fsck.c
View File

@ -401,14 +401,27 @@ static void check_connectivity(struct repository *repo)
}
}

static int fsck_obj(struct repository *repo,
struct object *obj, void *buffer, unsigned long size)
static int fsck_obj_buffer(const struct object_id *oid, enum object_type type,
unsigned long size, void *buffer, int *eaten, void *cb_data)
{
struct repository *repo = cb_data;
struct object *obj;
int err;

if (obj->flags & SEEN)
return 0;
obj->flags |= SEEN;
/*
* Note, buffer may be NULL if type is OBJ_BLOB. See
* verify_packfile(), data_valid variable for details.
*/
obj = parse_object_buffer(repo, oid, type, size, buffer, eaten);
if (!obj) {
errors_found |= ERROR_OBJECT;
err = error(_("%s: object corrupt or missing"),
oid_to_hex(oid));
goto out;
}

obj->flags &= ~REACHABLE;
obj->flags |= HAS_OBJ | SEEN;

if (verbose)
fprintf_ln(stderr, _("Checking %s %s"),
@ -417,6 +430,7 @@ static int fsck_obj(struct repository *repo,

if (fsck_walk(obj, NULL, &fsck_obj_options))
objerror(repo, obj, _("broken links"));

err = fsck_object(obj, buffer, size, &fsck_obj_options);
if (err)
goto out;
@ -442,32 +456,11 @@ static int fsck_obj(struct repository *repo,
}

out:
if (obj->type == OBJ_TREE)
if (obj && obj->type == OBJ_TREE)
free_tree_buffer((struct tree *)obj);
return err;
}

static int fsck_obj_buffer(const struct object_id *oid, enum object_type type,
unsigned long size, void *buffer, int *eaten, void *cb_data)
{
struct repository *repo = cb_data;
struct object *obj;

/*
* Note, buffer may be NULL if type is OBJ_BLOB. See
* verify_packfile(), data_valid variable for details.
*/
obj = parse_object_buffer(repo, oid, type, size, buffer, eaten);
if (!obj) {
errors_found |= ERROR_OBJECT;
return error(_("%s: object corrupt or missing"),
oid_to_hex(oid));
}
obj->flags &= ~(REACHABLE | SEEN);
obj->flags |= HAS_OBJ;
return fsck_obj(repo, obj, buffer, size);
}

static int default_refs;

static void fsck_handle_reflog_oid(struct repository *repo,