diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /builtin/rev-parse.c | |
parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) |
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/rev-parse.c')
-rw-r--r-- | builtin/rev-parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 1310f9cec1..8f61050bde 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -196,7 +196,7 @@ static int show_default(void) } static int show_reference(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { if (ref_excluded(ref_excludes, refname)) return 0; @@ -205,7 +205,7 @@ static int show_reference(const char *refname, const struct object_id *oid, } static int anti_reference(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { show_rev(REVERSED, oid, refname); return 0; |