diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 19:56:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 19:56:39 (GMT) |
| commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
| tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /compat | |
| parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
| parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) | |
| download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.zip git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.gz git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.bz2 | |
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 'compat')
| -rw-r--r-- | compat/terminal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/terminal.c b/compat/terminal.c index 0b0caae..ea490a7 100644 --- a/compat/terminal.c +++ b/compat/terminal.c @@ -477,7 +477,7 @@ struct escape_sequence_entry { char sequence[FLEX_ARRAY]; }; -static int sequence_entry_cmp(const void *UNUSED(hashmap_cmp_fn_data), +static int sequence_entry_cmp(const void *hashmap_cmp_fn_data UNUSED, const struct escape_sequence_entry *e1, const struct escape_sequence_entry *e2, const void *keydata) |