From: Junio C Hamano Date: Mon, 23 Mar 2026 15:48:15 GMT Subject: Re: [PATCH v2 02/12] fsck: initialize fsck options via a function Message-ID: In-Reply-To: <20260323-b4-pks-fsck-without-the-repository-v2-2-e8dc79bca651@pks.im> Patrick Steinhardt writes: > +void fsck_options_init(struct fsck_options *options, > + enum fsck_options_type type) > +{ > + static const struct fsck_options defaults[] = { > + [FSCK_OPTIONS_DEFAULT] = { > + .skip_oids = OIDSET_INIT, > + .gitmodules_found = OIDSET_INIT, > + .gitmodules_done = OIDSET_INIT, > + .gitattributes_found = OIDSET_INIT, > + .gitattributes_done = OIDSET_INIT, > + .error_func = fsck_objects_error_function > + }, > + [FSCK_OPTIONS_STRICT] = { > + .strict = 1, > + .gitmodules_found = OIDSET_INIT, > + .gitmodules_done = OIDSET_INIT, > + .gitattributes_found = OIDSET_INIT, > + .gitattributes_done = OIDSET_INIT, > + .error_func = fsck_objects_error_function, > + }, > + [FSCK_OPTIONS_MISSING_GITMODULES] = { > + .strict = 1, > + .gitmodules_found = OIDSET_INIT, > + .gitmodules_done = OIDSET_INIT, > + .gitattributes_found = OIDSET_INIT, > + .gitattributes_done = OIDSET_INIT, > + .error_func = fsck_objects_error_cb_print_missing_gitmodules, > + }, > + [FSCK_OPTIONS_REFS] = { > + .error_func = fsck_refs_error_function, > + }, > + }; > + > + switch (type) { > + case FSCK_OPTIONS_DEFAULT: > + case FSCK_OPTIONS_STRICT: > + case FSCK_OPTIONS_MISSING_GITMODULES: > + case FSCK_OPTIONS_REFS: > + memcpy(options, &defaults[type], sizeof(*options)); > + break; > + default: > + BUG("unknown fsck options type %d", type); > + } > +} Wow, nice reorganization that migrates the earlier definitions from the header file. By reusing these FSCK_OPTIONS_* names as an enum elements, we will let the compiler catch if any other branch adds new uses of these names with their original meaning, which is a nice touch, too. > void fsck_options_clear(struct fsck_options *options) > { > free(options->msg_type); > diff --git a/fsck.h b/fsck.h > index 65ecbb7fe1..9c973b53b2 100644 > --- a/fsck.h > +++ b/fsck.h > @@ -180,34 +180,6 @@ struct fsck_options { > kh_oid_map_t *object_names; > }; > > -#define FSCK_OPTIONS_DEFAULT { \ > - .skip_oids = OIDSET_INIT, \ > - .gitmodules_found = OIDSET_INIT, \ > - .gitmodules_done = OIDSET_INIT, \ > - .gitattributes_found = OIDSET_INIT, \ > - .gitattributes_done = OIDSET_INIT, \ > - .error_func = fsck_objects_error_function \ > -} > -#define FSCK_OPTIONS_STRICT { \ > - .strict = 1, \ > - .gitmodules_found = OIDSET_INIT, \ > - .gitmodules_done = OIDSET_INIT, \ > - .gitattributes_found = OIDSET_INIT, \ > - .gitattributes_done = OIDSET_INIT, \ > - .error_func = fsck_objects_error_function, \ > -} > -#define FSCK_OPTIONS_MISSING_GITMODULES { \ > - .strict = 1, \ > - .gitmodules_found = OIDSET_INIT, \ > - .gitmodules_done = OIDSET_INIT, \ > - .gitattributes_found = OIDSET_INIT, \ > - .gitattributes_done = OIDSET_INIT, \ > - .error_func = fsck_objects_error_cb_print_missing_gitmodules, \ > -} > -#define FSCK_REFS_OPTIONS_DEFAULT { \ > - .error_func = fsck_refs_error_function, \ > -} > - > /* descend in all linked child objects > * the return value is: > * -1 error in processing the object > @@ -255,6 +227,16 @@ int fsck_finish(struct fsck_options *options); > */ > bool fsck_has_queued_checks(struct fsck_options *options); > > +enum fsck_options_type { > + FSCK_OPTIONS_DEFAULT, > + FSCK_OPTIONS_STRICT, > + FSCK_OPTIONS_MISSING_GITMODULES, > + FSCK_OPTIONS_REFS, > +}; > + > +void fsck_options_init(struct fsck_options *options, > + enum fsck_options_type type); > + > /* > * Clear the fsck_options struct, freeing any allocated memory. > */ > diff --git a/object-file.c b/object-file.c > index c62e5496e0..186b2ff764 100644 > --- a/object-file.c > +++ b/object-file.c > @@ -1279,8 +1279,9 @@ static int index_mem(struct index_state *istate, > } > } > if (flags & INDEX_FORMAT_CHECK) { > - struct fsck_options opts = FSCK_OPTIONS_DEFAULT; > + struct fsck_options opts; > > + fsck_options_init(&opts, FSCK_OPTIONS_DEFAULT); > opts.strict = 1; > opts.error_func = hash_format_check_report; > if (fsck_buffer(null_oid(istate->repo->hash_algo), type, buf, size, &opts))