diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-25 20:09:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 20:49:48 +0300 |
| commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
| tree | 03de8d4160649a0b4c1dd79164d746206743f25d /revision.c | |
| parent | 776515ef8b381d49caeccfe2e8da98cb666e257a (diff) | |
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 'revision.c')
| -rw-r--r-- | revision.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/revision.c b/revision.c index 5eb71e32d0d..5451a698ec3 100644 --- a/revision.c +++ b/revision.c @@ -119,10 +119,10 @@ struct path_and_oids_entry { struct oidset trees; }; -static int path_and_oids_cmp(const void *UNUSED(hashmap_cmp_fn_data), +static int path_and_oids_cmp(const void *hashmap_cmp_fn_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *UNUSED(keydata)) + const void *keydata UNUSED) { const struct path_and_oids_entry *e1, *e2; @@ -1543,7 +1543,7 @@ int ref_excluded(struct string_list *ref_excludes, const char *path) } static int handle_one_ref(const char *path, const struct object_id *oid, - int UNUSED(flag), + int flag UNUSED, void *cb_data) { struct all_refs_cb *cb = cb_data; @@ -1619,10 +1619,10 @@ static void handle_one_reflog_commit(struct object_id *oid, void *cb_data) } static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), - timestamp_t UNUSED(timestamp), - int UNUSED(tz), - const char *UNUSED(message), + const char *email UNUSED, + timestamp_t timestamp UNUSED, + int tz UNUSED, + const char *message UNUSED, void *cb_data) { handle_one_reflog_commit(ooid, cb_data); @@ -1631,8 +1631,8 @@ static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid, } static int handle_one_reflog(const char *refname_in_wt, - 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 all_refs_cb *cb = cb_data; struct strbuf refname = STRBUF_INIT; |