summaryrefslogtreecommitdiff
path: root/builtin/fsck.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-08-25 17:09:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-09-01 17:49:48 (GMT)
commit5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch)
tree03de8d4160649a0b4c1dd79164d746206743f25d /builtin/fsck.c
parent776515ef8b381d49caeccfe2e8da98cb666e257a (diff)
downloadgit-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.zip
git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.gz
git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.bz2
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
As reported in [1] the "UNUSED(var)" macro introduced in 2174b8c75de (Merge branch 'jk/unused-annotation' into next, 2022-08-24) breaks coccinelle's parsing of our sources in files where it occurs. Let's instead partially go with the approach suggested in [2] of making this not take an argument. As noted in [1] "coccinelle" will ignore such tokens in argument lists that it doesn't know about, and it's less of a surprise to syntax highlighters. This undoes the "help us notice when a parameter marked as unused is actually use" part of 9b240347543 (git-compat-util: add UNUSED macro, 2022-08-19), a subsequent commit will further tweak the macro to implement a replacement for that functionality. 1. https://lore.kernel.org/git/220825.86ilmg4mil.gmgdl@evledraar.gmail.com/ 2. https://lore.kernel.org/git/220819.868rnk54ju.gmgdl@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fsck.c')
-rw-r--r--builtin/fsck.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 31d3da8..f7916f0 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -488,9 +488,9 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
}
static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid,
- const char *UNUSED(email),
- timestamp_t timestamp, int UNUSED(tz),
- const char *UNUSED(message), void *cb_data)
+ const char *email UNUSED,
+ timestamp_t timestamp, int tz UNUSED,
+ const char *message UNUSED, void *cb_data)
{
const char *refname = cb_data;
@@ -504,8 +504,8 @@ static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid
}
static int fsck_handle_reflog(const char *logname,
- const struct object_id *UNUSED(oid),
- int UNUSED(flag), void *cb_data)
+ const struct object_id *oid UNUSED,
+ int flag UNUSED, void *cb_data)
{
struct strbuf refname = STRBUF_INIT;
@@ -516,7 +516,7 @@ static int fsck_handle_reflog(const char *logname,
}
static int fsck_handle_ref(const char *refname, const struct object_id *oid,
- int UNUSED(flag), void *UNUSED(cb_data))
+ int flag UNUSED, void *cb_data UNUSED)
{
struct object *obj;