parse-options: mark unused "opt" parameter in callbacks

The previous commit argued that parse-options callbacks should try to use opt->value rather than touching globals directly. In some cases, however, that's awkward to do. Some callbacks touch multiple variables, or may even just call into an abstracted function that does so. In some of these cases we _could_ convert them by stuffing the multiple variables into a single struct and passing the struct pointer through opt->value. But that may make other parts of the code less readable, as the struct relationship has to be mentioned everywhere. Let's just accept that these cases are special and leave them as-is. But we do need to mark their "opt" parameters to satisfy -Wunused-parameter. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 31, 2023 at 17:21 UTC 34bf44f2d50e835a4824a07c139bdececccf4da1
6 files changed +14 -12
builtin/gc.c
+1 -1
@@ -1403,7 +1403,7 @@ static void initialize_task_config(int schedule)
1403 strbuf_release(&config_name);
1404 }
1405
1406 -static int task_option_parse(const struct option *opt,
1406 +static int task_option_parse(const struct option *opt UNUSED,
1407 const char *arg, int unset)
1408 {
1409 int i, num_selected = 0;
builtin/log.c
+6 -4
@@ -118,8 +118,8 @@ static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
118 static struct string_list decorate_refs_exclude_config = STRING_LIST_INIT_NODUP;
119 static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
120
121 -static int clear_decorations_callback(const struct option *opt,
122 - const char *arg, int unset)
121 +static int clear_decorations_callback(const struct option *opt UNUSED,
122 + const char *arg, int unset)
123 {
124 string_list_clear(&decorate_refs_include, 0);
125 string_list_clear(&decorate_refs_exclude, 0);
@@ -127,7 +127,8 @@ static int clear_decorations_callback(const struct option *opt,
127 return 0;
128 }
129
130 -static int decorate_callback(const struct option *opt, const char *arg, int unset)
130 +static int decorate_callback(const struct option *opt UNUSED, const char *arg,
131 + int unset)
132 {
133 if (unset)
134 decoration_style = 0;
@@ -1555,7 +1556,8 @@ static int inline_callback(const struct option *opt, const char *arg, int unset)
1556 return 0;
1557 }
1558
1558 -static int header_callback(const struct option *opt, const char *arg, int unset)
1559 +static int header_callback(const struct option *opt UNUSED, const char *arg,
1560 + int unset)
1561 {
1562 if (unset) {
1563 string_list_clear(&extra_hdr, 0);
builtin/merge.c
+1 -1
@@ -231,7 +231,7 @@ static void append_strategy(struct strategy *s)
231 use_strategies[use_strategies_nr++] = s;
232 }
233
234 -static int option_parse_strategy(const struct option *opt,
234 +static int option_parse_strategy(const struct option *opt UNUSED,
235 const char *name, int unset)
236 {
237 if (unset)
builtin/pack-objects.c
+3 -3
@@ -3739,7 +3739,7 @@ static void show_object__ma_allow_promisor(struct object *obj, const char *name,
3739 show_object(obj, name, data);
3740 }
3741
3742 -static int option_parse_missing_action(const struct option *opt,
3742 +static int option_parse_missing_action(const struct option *opt UNUSED,
3743 const char *arg, int unset)
3744 {
3745 assert(arg);
@@ -4150,7 +4150,7 @@ static int option_parse_index_version(const struct option *opt,
4150 return 0;
4151 }
4152
4153 -static int option_parse_unpack_unreachable(const struct option *opt,
4153 +static int option_parse_unpack_unreachable(const struct option *opt UNUSED,
4154 const char *arg, int unset)
4155 {
4156 if (unset) {
@@ -4165,7 +4165,7 @@ static int option_parse_unpack_unreachable(const struct option *opt,
4165 return 0;
4166 }
4167
4168 -static int option_parse_cruft_expiration(const struct option *opt,
4168 +static int option_parse_cruft_expiration(const struct option *opt UNUSED,
4169 const char *arg, int unset)
4170 {
4171 if (unset) {
builtin/read-tree.c
+1 -1
@@ -49,7 +49,7 @@ static const char * const read_tree_usage[] = {
49 NULL
50 };
51
52 -static int index_output_cb(const struct option *opt, const char *arg,
52 +static int index_output_cb(const struct option *opt UNUSED, const char *arg,
53 int unset)
54 {
55 BUG_ON_OPT_NEG(unset);
builtin/update-index.c
+2 -2
@@ -856,7 +856,7 @@ static int chmod_callback(const struct option *opt,
856 return 0;
857 }
858
859 -static int resolve_undo_clear_callback(const struct option *opt,
859 +static int resolve_undo_clear_callback(const struct option *opt UNUSED,
860 const char *arg, int unset)
861 {
862 BUG_ON_OPT_NEG(unset);
@@ -890,7 +890,7 @@ static int parse_new_style_cacheinfo(const char *arg,
890 }
891
892 static enum parse_opt_result cacheinfo_callback(
893 - struct parse_opt_ctx_t *ctx, const struct option *opt,
893 + struct parse_opt_ctx_t *ctx, const struct option *opt UNUSED,
894 const char *arg, int unset)
895 {
896 struct object_id oid;