diff options
author | Jeff King <peff@peff.net> | 2022-08-19 10:08:35 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 19:18:54 (GMT) |
commit | c006e9fa59c02261738e20890f1aecd78f9db707 (patch) | |
tree | a4cf31a2702cc2221c8093e32495fde1a4e47d97 | |
parent | 63e14ee2d69b58eae72e34df81f2cde145427037 (diff) | |
download | git-c006e9fa59c02261738e20890f1aecd78f9db707.zip git-c006e9fa59c02261738e20890f1aecd78f9db707.tar.gz git-c006e9fa59c02261738e20890f1aecd78f9db707.tar.bz2 |
refs: mark unused reflog callback parameters
Functions used with for_each_reflog_ent() need to conform to a
particular interface, but not every function needs all of the
parameters. Mark the unused ones to make -Wunused-parameter happy.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | builtin/fsck.c | 5 | ||||
-rw-r--r-- | builtin/stash.c | 9 | ||||
-rw-r--r-- | commit.c | 5 | ||||
-rw-r--r-- | object-name.c | 7 | ||||
-rw-r--r-- | reflog.c | 13 | ||||
-rw-r--r-- | refs.c | 10 | ||||
-rw-r--r-- | remote.c | 15 | ||||
-rw-r--r-- | revision.c | 7 | ||||
-rw-r--r-- | t/helper/test-ref-store.c | 2 | ||||
-rw-r--r-- | wt-status.c | 14 |
10 files changed, 55 insertions, 32 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 36f1524..31d3da8 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -488,8 +488,9 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, } static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) + const char *UNUSED(email), + timestamp_t timestamp, int UNUSED(tz), + const char *UNUSED(message), void *cb_data) { const char *refname = cb_data; diff --git a/builtin/stash.c b/builtin/stash.c index 30fa101..a741b92 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -638,9 +638,12 @@ cleanup: return ret; } -static int reject_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) +static int reject_reflog_ent(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 *UNUSED(cb_data)) { return 1; } @@ -951,8 +951,9 @@ static void add_one_commit(struct object_id *oid, struct rev_collect *revs) } static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *ident, timestamp_t timestamp, - int tz, const char *message, void *cbdata) + const char *UNUSED(ident), + timestamp_t UNUSED(timestamp), int UNUSED(tz), + const char *UNUSED(message), void *cbdata) { struct rev_collect *revs = cbdata; diff --git a/object-name.c b/object-name.c index 0526449..3f7fce8 100644 --- a/object-name.c +++ b/object-name.c @@ -1385,8 +1385,11 @@ struct grab_nth_branch_switch_cbdata { struct strbuf *sb; }; -static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, +static int grab_nth_branch_switch(struct object_id *UNUSED(ooid), + struct object_id *UNUSED(noid), + const char *UNUSED(email), + timestamp_t UNUSED(timestamp), + int UNUSED(tz), const char *message, void *cb_data) { struct grab_nth_branch_switch_cbdata *cb = cb_data; @@ -240,8 +240,9 @@ static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit * Return true iff the specified reflog entry should be expired. */ int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) + const char *UNUSED(email), + timestamp_t timestamp, int UNUSED(tz), + const char *UNUSED(message), void *cb_data) { struct expire_reflog_policy_cb *cb = cb_data; struct commit *old_commit, *new_commit; @@ -379,9 +380,11 @@ void reflog_expiry_cleanup(void *cb_data) } } -int count_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) +int count_reflog_ent(struct object_id *UNUSED(ooid), + struct object_id *UNUSED(noid), + const char *UNUSED(email), + timestamp_t timestamp, int UNUSED(tz), + const char *UNUSED(message), void *cb_data) { struct cmd_reflog_expire_cb *cb = cb_data; if (!cb->expire_total || timestamp < cb->expire_total) @@ -894,8 +894,9 @@ 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 *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) + const char *UNUSED(email), + timestamp_t timestamp, int tz, + const char *message, void *cb_data) { struct read_ref_at_cb *cb = cb_data; int reached_count; @@ -950,8 +951,9 @@ 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 *email, timestamp_t timestamp, - int tz, const char *message, void *cb_data) + const char *UNUSED(email), + timestamp_t timestamp, int tz, + const char *message, void *cb_data) { struct read_ref_at_cb *cb = cb_data; @@ -2577,19 +2577,22 @@ struct check_and_collect_until_cb_data { }; /* Get the timestamp of the latest entry. */ -static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid, - const char *ident, timestamp_t timestamp, - int tz, const char *message, void *cb_data) +static int peek_reflog(struct object_id *UNUSED(o_oid), + struct object_id *UNUSED(n_oid), + const char *UNUSED(ident), + timestamp_t timestamp, int UNUSED(tz), + const char *UNUSED(message), void *cb_data) { timestamp_t *ts = cb_data; *ts = timestamp; return 1; } -static int check_and_collect_until(struct object_id *o_oid, +static int check_and_collect_until(struct object_id *UNUSED(o_oid), struct object_id *n_oid, - const char *ident, timestamp_t timestamp, - int tz, const char *message, void *cb_data) + const char *UNUSED(ident), + timestamp_t timestamp, int UNUSED(tz), + const char *UNUSED(message), void *cb_data) { struct commit *commit; struct check_and_collect_until_cb_data *cb = cb_data; @@ -1619,8 +1619,11 @@ 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 *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) + const char *UNUSED(email), + timestamp_t UNUSED(timestamp), + int UNUSED(tz), + const char *UNUSED(message), + void *cb_data) { handle_one_reflog_commit(ooid, cb_data); handle_one_reflog_commit(noid, cb_data); diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index a98775d..8f930ad 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c @@ -207,7 +207,7 @@ static int cmd_for_each_reflog(struct ref_store *refs, const char **argv) static int each_reflog(struct object_id *old_oid, struct object_id *new_oid, const char *committer, timestamp_t timestamp, - int tz, const char *msg, void *cb_data) + int tz, const char *msg, void *UNUSED(cb_data)) { printf("%s %s %s %" PRItime " %+05d%s%s", oid_to_hex(old_oid), oid_to_hex(new_oid), committer, timestamp, tz, diff --git a/wt-status.c b/wt-status.c index 867e3e4..38d0900 100644 --- a/wt-status.c +++ b/wt-status.c @@ -947,9 +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 *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) +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) { int *c = cb_data; (*c)++; @@ -1612,8 +1614,10 @@ struct grab_1st_switch_cbdata { struct object_id noid; }; -static int grab_1st_switch(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, +static int grab_1st_switch(struct object_id *UNUSED(ooid), + struct object_id *noid, + const char *UNUSED(email), + timestamp_t UNUSED(timestamp), int UNUSED(tz), const char *message, void *cb_data) { struct grab_1st_switch_cbdata *cb = cb_data; |