diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-03-17 21:20:36 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-18 00:02:43 +0300 |
commit | fb79f5bff7f47f41cf3697ecc28bfaa888016ce0 (patch) | |
tree | 3edce7d259bfce062a4fbd266f2a61b9d0680174 /builtin/fsck.c | |
parent | a5828ae6b52137b913b978e16cd2334482eb4c1f (diff) |
fsck.c: refactor and rename common config callback
Refactor code I recently changed in 1f3299fda9 (fsck: make
fsck_config() re-usable, 2021-01-05) so that I could use fsck's config
callback in mktag in 1f3299fda9 (fsck: make fsck_config() re-usable,
2021-01-05).
I don't know what I was thinking in structuring the code this way, but
it clearly makes no sense to have an fsck_config_internal() at all
just so it can get a fsck_options when git_config() already supports
passing along some void* data.
Let's just make use of that instead, which gets us rid of the two
wrapper functions, and brings fsck's common config callback in line
with other such reusable config callbacks.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fsck.c')
-rw-r--r-- | builtin/fsck.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 821e7798c7..a56a2d0513 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -71,11 +71,6 @@ static const char *printable_type(const struct object_id *oid, return ret; } -static int fsck_config(const char *var, const char *value, void *cb) -{ - return fsck_config_internal(var, value, cb, &fsck_obj_options); -} - static int objerror(struct object *obj, const char *err) { errors_found |= ERROR_OBJECT; @@ -803,7 +798,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) if (name_objects) fsck_enable_object_names(&fsck_walk_options); - git_config(fsck_config, NULL); + git_config(git_fsck_config, &fsck_obj_options); if (connectivity_only) { for_each_loose_object(mark_loose_for_connectivity, NULL, 0); |