mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/unused-annotation'

Browse Source 
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)"
This commit is contained in:
Junio C Hamano
2022-09-14 12:56:39 -07:00
parent a6b42ec0c6 9ff7eb8c88
commit dd407f1c7c
93 changed files with 270 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/difftool.c
View File

@ -125,10 +125,10 @@ struct working_tree_entry {
char path[FLEX_ARRAY];
};
static int working_tree_entry_cmp(const void *UNUSED(cmp_data),
static int working_tree_entry_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 working_tree_entry *a, *b;
@ -148,10 +148,10 @@ struct pair_entry {
const char path[FLEX_ARRAY];
};
static int pair_cmp(const void *UNUSED(cmp_data),
static int pair_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 pair_entry *a, *b;
@ -184,7 +184,7 @@ struct path_entry {
char path[FLEX_ARRAY];
};
static int path_entry_cmp(const void *UNUSED(cmp_data),
static int path_entry_cmp(const void *cmp_data UNUSED,
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *key)