diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 19:56:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 19:56:39 (GMT) |
| commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
| tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /builtin/bisect--helper.c | |
| parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
| parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) | |
| download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.zip git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.gz git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.bz2 | |
Merge branch 'ab/unused-annotation'
Undoes 'jk/unused-annotation' topic and redoes it to work around
Coccinelle rules misfiring false positives in unrelated codepaths.
* ab/unused-annotation:
git-compat-util.h: use "deprecated" for UNUSED variables
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
Diffstat (limited to 'builtin/bisect--helper.c')
| -rw-r--r-- | builtin/bisect--helper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 2bdbad4..501245f 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -329,9 +329,9 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd) return 0; } -static int inc_nr(const char *UNUSED(refname), - const struct object_id *UNUSED(oid), - int UNUSED(flag), void *cb_data) +static int inc_nr(const char *refname UNUSED, + const struct object_id *oid UNUSED, + int flag UNUSED, void *cb_data) { unsigned int *nr = (unsigned int *)cb_data; (*nr)++; @@ -519,7 +519,7 @@ finish: } static int add_bisect_ref(const char *refname, const struct object_id *oid, - int UNUSED(flags), void *cb) + int flags UNUSED, void *cb) { struct add_bisect_ref_data *data = cb; @@ -1135,9 +1135,9 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a return res; } -static int get_first_good(const char *UNUSED(refname), +static int get_first_good(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flag), void *cb_data) + int flag UNUSED, void *cb_data) { oidcpy(cb_data, oid); return 1; |