[PATCH v4 03/22] fsck.h: reduce duplication between FSCK_OPTIONS_{DEFAULT,STRICT}
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Mar 16, 2021, 16:17 UTC
- Message-ID
- <20210316161738.30254-4-avarab@gmail.com>
- In-Reply-To
- <20210306110439.27694-1-avarab@gmail.com>
Use a temporary macro to define what FSCK_OPTIONS_{DEFAULT,STRICT} have in common, and define the two in terms of that macro.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- fsck.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/fsck.h b/fsck.h index 40f3cb3f64..ea3a907ec3 100644 --- a/fsck.h +++ b/fsck.h @@ -43,22 +43,14 @@ struct fsck_options { kh_oid_map_t *object_names; }; -#define FSCK_OPTIONS_DEFAULT { \ +#define FSCK_OPTIONS_COMMON \ .walk = NULL, \ .error_func = fsck_error_function, \ - .strict = 0, \ .msg_type = NULL, \ .skiplist = OIDSET_INIT, \ - .object_names = NULL, \ -} -#define FSCK_OPTIONS_STRICT { \ - .walk = NULL, \ - .error_func = fsck_error_function, \ - .strict = 1, \ - .msg_type = NULL, \ - .skiplist = OIDSET_INIT, \ - .object_names = NULL, \ -} + .object_names = NULL, +#define FSCK_OPTIONS_DEFAULT { .strict = 0, FSCK_OPTIONS_COMMON } +#define FSCK_OPTIONS_STRICT { .strict = 1, FSCK_OPTIONS_COMMON } /* descend in all linked child objects * the return value is:
-- 2.31.0.260.g719c683c1d