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 /revision.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 'revision.c')
-rw-r--r-- | revision.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/revision.c b/revision.c index f19235dd18..d5f4463cb6 100644 --- a/revision.c +++ b/revision.c @@ -119,10 +119,10 @@ struct path_and_oids_entry { struct oidset trees; }; -static int path_and_oids_cmp(const void *UNUSED(hashmap_cmp_fn_data), +static int path_and_oids_cmp(const void *hashmap_cmp_fn_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *UNUSED(keydata)) + const void *keydata UNUSED) { const struct path_and_oids_entry *e1, *e2; @@ -1546,7 +1546,7 @@ int ref_excluded(struct string_list *ref_excludes, const char *path) } static int handle_one_ref(const char *path, const struct object_id *oid, - int UNUSED(flag), + int flag UNUSED, void *cb_data) { struct all_refs_cb *cb = cb_data; @@ -1622,10 +1622,10 @@ static void handle_one_reflog_commit(struct object_id *oid, void *cb_data) } static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), - timestamp_t UNUSED(timestamp), - int UNUSED(tz), - const char *UNUSED(message), + const char *email UNUSED, + timestamp_t timestamp UNUSED, + int tz UNUSED, + const char *message UNUSED, void *cb_data) { handle_one_reflog_commit(ooid, cb_data); @@ -1634,8 +1634,8 @@ static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid, } static int handle_one_reflog(const char *refname_in_wt, - const struct object_id *UNUSED(oid), - int UNUSED(flag), void *cb_data) + const struct object_id *oid UNUSED, + int flag UNUSED, void *cb_data) { struct all_refs_cb *cb = cb_data; struct strbuf refname = STRBUF_INIT; |