diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-25 19:09:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 10:49:48 -0700 |
| commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
| tree | 03de8d4160649a0b4c1dd79164d746206743f25d /merge-recursive.c | |
| parent | 776515ef8b381d49caeccfe2e8da98cb666e257a (diff) | |
| download | git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.gz | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 08c1c36d33..4ddd3adea0 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -45,7 +45,7 @@ struct path_hashmap_entry { char path[FLEX_ARRAY]; }; -static int path_hashmap_cmp(const void *UNUSED(cmp_data), +static int path_hashmap_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *keydata) @@ -89,10 +89,10 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, return hashmap_get_entry(hashmap, &key, ent, NULL); } -static int dir_rename_cmp(const void *UNUSED(cmp_data), +static int dir_rename_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *UNUSED(keydata)) + const void *keydata UNUSED) { const struct dir_rename_entry *e1, *e2; @@ -134,10 +134,10 @@ static struct collision_entry *collision_find_entry(struct hashmap *hashmap, return hashmap_get_entry(hashmap, &key, ent, NULL); } -static int collision_cmp(const void *UNUSED(cmp_data), +static int collision_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *UNUSED(keydata)) + const void *keydata UNUSED) { const struct collision_entry *e1, *e2; @@ -456,7 +456,7 @@ static void unpack_trees_finish(struct merge_options *opt) clear_unpack_trees_porcelain(&opt->priv->unpack_opts); } -static int save_files_dirs(const struct object_id *UNUSED(oid), +static int save_files_dirs(const struct object_id *oid UNUSED, struct strbuf *base, const char *path, unsigned int mode, void *context) { |