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 /submodule-config.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 'submodule-config.c')
-rw-r--r-- | submodule-config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/submodule-config.c b/submodule-config.c index d7a8ca0269..cd7ee236a1 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -38,10 +38,10 @@ enum lookup_type { lookup_path }; -static int config_path_cmp(const void *UNUSED(cmp_data), +static int config_path_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 submodule_entry *a, *b; @@ -52,10 +52,10 @@ static int config_path_cmp(const void *UNUSED(cmp_data), !oideq(&a->config->gitmodules_oid, &b->config->gitmodules_oid); } -static int config_name_cmp(const void *UNUSED(cmp_data), +static int config_name_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 submodule_entry *a, *b; |