diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 21:56:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 21:56:39 +0200 |
| commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
| tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /range-diff.c | |
| parent | Merge branch 'jk/unused-annotation' (diff) | |
| parent | git-compat-util.h: use "deprecated" for UNUSED variables (diff) | |
| download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.xz git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.zip | |
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 'range-diff.c')
| -rw-r--r-- | range-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/range-diff.c b/range-diff.c index c9e7787767..8b7d81adc1 100644 --- a/range-diff.c +++ b/range-diff.c @@ -224,7 +224,7 @@ cleanup: return ret; } -static int patch_util_cmp(const void *UNUSED(cmp_data), +static int patch_util_cmp(const void *cmp_data UNUSED, const struct patch_util *a, const struct patch_util *b, const char *keydata) |