diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
| commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
| tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /fetch-pack.c | |
| parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
| parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) | |
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 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 2e98863f81..998fc2fa1e 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -176,9 +176,9 @@ static int rev_list_insert_ref(struct fetch_negotiator *negotiator, return 0; } -static int rev_list_insert_ref_oid(const char *UNUSED(refname), +static int rev_list_insert_ref_oid(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flag), + int flag UNUSED, void *cb_data) { return rev_list_insert_ref(cb_data, oid); @@ -602,10 +602,10 @@ static int mark_complete(const struct object_id *oid) return 0; } -static int mark_complete_oid(const char *UNUSED(refname), +static int mark_complete_oid(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flag), - void *UNUSED(cb_data)) + int flag UNUSED, + void *cb_data UNUSED) { return mark_complete(oid); } @@ -843,7 +843,7 @@ static int everything_local(struct fetch_pack_args *args, return retval; } -static int sideband_demux(int UNUSED(in), int out, void *data) +static int sideband_demux(int in UNUSED, int out, void *data) { int *xd = data; int ret; |