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

12
builtin/bisect--helper.c
View File

@ -329,9 +329,9 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
return 0;
}
static int inc_nr(const char *UNUSED(refname),
const struct object_id *UNUSED(oid),
int UNUSED(flag), void *cb_data)
static int inc_nr(const char *refname UNUSED,
const struct object_id *oid UNUSED,
int flag UNUSED, void *cb_data)
{
unsigned int *nr = (unsigned int *)cb_data;
(*nr)++;
@ -519,7 +519,7 @@ finish:
}
static int add_bisect_ref(const char *refname, const struct object_id *oid,
int UNUSED(flags), void *cb)
int flags UNUSED, void *cb)
{
struct add_bisect_ref_data *data = cb;
@ -1135,9 +1135,9 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a
return res;
}
static int get_first_good(const char *UNUSED(refname),
static int get_first_good(const char *refname UNUSED,
const struct object_id *oid,
int UNUSED(flag), void *cb_data)
int flag UNUSED, void *cb_data)
{
oidcpy(cb_data, oid);
return 1;