undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs: mark unused reflog callback parameters

Browse Source 
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>
This commit is contained in:
Jeff King 2022-08-19 06:08:35 -04:00 committed by Junio C Hamano
parent 63e14ee2d6
commit c006e9fa59
10 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/fsck.c
View File

@ -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;

9
builtin/stash.c
View File

@ -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;
}

5
commit.c
View File

@ -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;

7
object-name.c
View File

@ -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;

13
reflog.c
View File

@ -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)

10
refs.c
View File

@ -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;

15
remote.c
View File

@ -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;

7
revision.c
View File

@ -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);

2
t/helper/test-ref-store.c
View File

@ -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,

14
wt-status.c
View File

@ -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;