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
submodule.c
View File

@ -214,7 +214,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
/* Cheap function that only determines if we're interested in submodules at all */
int git_default_submodule_config(const char *var, const char *value,
void *UNUSED(cb))
void *cb UNUSED)
{
if (!strcmp(var, "submodule.recurse")) {
int v = git_config_bool(var, value) ?
@ -939,9 +939,9 @@ static void free_submodules_data(struct string_list *submodules)
string_list_clear(submodules, 1);
}
static int has_remote(const char *UNUSED(refname),
const struct object_id *UNUSED(oid),
int UNUSED(flags), void *UNUSED(cb_data))
static int has_remote(const char *refname UNUSED,
const struct object_id *oid UNUSED,
int flags UNUSED, void *cb_data UNUSED)
{
return 1;
}
@ -1243,9 +1243,9 @@ int push_unpushed_submodules(struct repository *r,
return ret;
}
static int append_oid_to_array(const char *UNUSED(ref),
static int append_oid_to_array(const char *ref UNUSED,
const struct object_id *oid,
int UNUSED(flags), void *data)
int flags UNUSED, void *data)
{
struct oid_array *array = data;
oid_array_append(array, oid);