diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 21:56:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 21:56:39 +0200 |
| commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
| tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /refs.c | |
| parent | Merge branch 'jk/unused-annotation' (diff) | |
| parent | git-compat-util.h: use "deprecated" for UNUSED variables (diff) | |
| download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.xz git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.zip | |
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 'refs.c')
| -rw-r--r-- | refs.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -442,7 +442,7 @@ struct warn_if_dangling_data { }; static int warn_if_dangling_symref(const char *refname, - const struct object_id *UNUSED(oid), + const struct object_id *oid UNUSED, int flags, void *cb_data) { struct warn_if_dangling_data *d = cb_data; @@ -982,7 +982,7 @@ static void set_read_ref_cutoffs(struct read_ref_at_cb *cb, } static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), + const char *email UNUSED, timestamp_t timestamp, int tz, const char *message, void *cb_data) { @@ -1024,9 +1024,9 @@ static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid, return cb->found_it; } -static int read_ref_at_ent_newest(struct object_id *UNUSED(ooid), +static int read_ref_at_ent_newest(struct object_id *ooid UNUSED, struct object_id *noid, - const char *UNUSED(email), + const char *email UNUSED, timestamp_t timestamp, int tz, const char *message, void *cb_data) { @@ -1039,7 +1039,7 @@ static int read_ref_at_ent_newest(struct object_id *UNUSED(ooid), } static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), + const char *email UNUSED, timestamp_t timestamp, int tz, const char *message, void *cb_data) { @@ -1904,7 +1904,7 @@ struct ref_store_hash_entry char name[FLEX_ARRAY]; }; -static int ref_store_hash_cmp(const void *UNUSED(cmp_data), +static int ref_store_hash_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *keydata) |