diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:39 -0700 |
| commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
| tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /wt-status.c | |
| parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
| parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) | |
| download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.gz | |
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 'wt-status.c')
| -rw-r--r-- | wt-status.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wt-status.c b/wt-status.c index 38d0900aa9..5813174896 100644 --- a/wt-status.c +++ b/wt-status.c @@ -947,11 +947,11 @@ static void wt_longstatus_print_changed(struct wt_status *s) wt_longstatus_print_trailer(s); } -static int stash_count_refs(struct object_id *UNUSED(ooid), - struct object_id *UNUSED(noid), - const char *UNUSED(email), - timestamp_t UNUSED(timestamp), int UNUSED(tz), - const char *UNUSED(message), void *cb_data) +static int stash_count_refs(struct object_id *ooid UNUSED, + struct object_id *noid UNUSED, + const char *email UNUSED, + timestamp_t timestamp UNUSED, int tz UNUSED, + const char *message UNUSED, void *cb_data) { int *c = cb_data; (*c)++; @@ -1614,10 +1614,10 @@ struct grab_1st_switch_cbdata { struct object_id noid; }; -static int grab_1st_switch(struct object_id *UNUSED(ooid), +static int grab_1st_switch(struct object_id *ooid UNUSED, struct object_id *noid, - const char *UNUSED(email), - timestamp_t UNUSED(timestamp), int UNUSED(tz), + const char *email UNUSED, + timestamp_t timestamp UNUSED, int tz UNUSED, const char *message, void *cb_data) { struct grab_1st_switch_cbdata *cb = cb_data; |