Skip to content

Commit 7718827

Browse files
peffgitster
authored andcommitted
refs: mark unused virtual method parameters
The refs code uses various polymorphic types (e.g., loose vs packed ref_stores, abstracted iterators). Not every virtual function or callback needs all of its parameters. Let's mark the unused ones to quiet -Wunused-parameter. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c006e9f commit 7718827

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

refs/files-backend.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,8 +2202,8 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
22022202
return ok;
22032203
}
22042204

2205-
static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator,
2206-
struct object_id *peeled)
2205+
static int files_reflog_iterator_peel(struct ref_iterator *UNUSED(ref_iterator),
2206+
struct object_id *UNUSED(peeled))
22072207
{
22082208
BUG("ref_iterator_peel() called for reflog_iterator");
22092209
}
@@ -2257,7 +2257,7 @@ static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
22572257
static enum iterator_selection reflog_iterator_select(
22582258
struct ref_iterator *iter_worktree,
22592259
struct ref_iterator *iter_common,
2260-
void *cb_data)
2260+
void *UNUSED(cb_data))
22612261
{
22622262
if (iter_worktree) {
22632263
/*
@@ -2985,7 +2985,7 @@ static int files_transaction_finish(struct ref_store *ref_store,
29852985

29862986
static int files_transaction_abort(struct ref_store *ref_store,
29872987
struct ref_transaction *transaction,
2988-
struct strbuf *err)
2988+
struct strbuf *UNUSED(err))
29892989
{
29902990
struct files_ref_store *refs =
29912991
files_downcast(ref_store, 0, "ref_transaction_abort");
@@ -3261,7 +3261,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
32613261
return -1;
32623262
}
32633263

3264-
static int files_init_db(struct ref_store *ref_store, struct strbuf *err)
3264+
static int files_init_db(struct ref_store *ref_store, struct strbuf *UNUSED(err))
32653265
{
32663266
struct files_ref_store *refs =
32673267
files_downcast(ref_store, REF_STORE_WRITE, "init_db");

refs/iterator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ static int empty_ref_iterator_advance(struct ref_iterator *ref_iterator)
5151
return ref_iterator_abort(ref_iterator);
5252
}
5353

54-
static int empty_ref_iterator_peel(struct ref_iterator *ref_iterator,
55-
struct object_id *peeled)
54+
static int empty_ref_iterator_peel(struct ref_iterator *UNUSED(ref_iterator),
55+
struct object_id *UNUSED(peeled))
5656
{
5757
BUG("peel called for empty iterator");
5858
}
@@ -238,7 +238,7 @@ struct ref_iterator *merge_ref_iterator_begin(
238238
*/
239239
static enum iterator_selection overlay_iterator_select(
240240
struct ref_iterator *front, struct ref_iterator *back,
241-
void *cb_data)
241+
void *UNUSED(cb_data))
242242
{
243243
int cmp;
244244

refs/packed-backend.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ static struct snapshot *get_snapshot(struct packed_ref_store *refs)
726726
}
727727

728728
static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname,
729-
struct object_id *oid, struct strbuf *referent,
729+
struct object_id *oid, struct strbuf *UNUSED(referent),
730730
unsigned int *type, int *failure_errno)
731731
{
732732
struct packed_ref_store *refs =
@@ -1078,7 +1078,8 @@ int packed_refs_is_locked(struct ref_store *ref_store)
10781078
static const char PACKED_REFS_HEADER[] =
10791079
"# pack-refs with: peeled fully-peeled sorted \n";
10801080

1081-
static int packed_init_db(struct ref_store *ref_store, struct strbuf *err)
1081+
static int packed_init_db(struct ref_store *UNUSED(ref_store),
1082+
struct strbuf *UNUSED(err))
10821083
{
10831084
/* Nothing to do. */
10841085
return 0;
@@ -1473,7 +1474,7 @@ static int packed_transaction_prepare(struct ref_store *ref_store,
14731474

14741475
static int packed_transaction_abort(struct ref_store *ref_store,
14751476
struct ref_transaction *transaction,
1476-
struct strbuf *err)
1477+
struct strbuf *UNUSED(err))
14771478
{
14781479
struct packed_ref_store *refs = packed_downcast(
14791480
ref_store,
@@ -1512,7 +1513,7 @@ static int packed_transaction_finish(struct ref_store *ref_store,
15121513
return ret;
15131514
}
15141515

1515-
static int packed_initial_transaction_commit(struct ref_store *ref_store,
1516+
static int packed_initial_transaction_commit(struct ref_store *UNUSED(ref_store),
15161517
struct ref_transaction *transaction,
15171518
struct strbuf *err)
15181519
{
@@ -1568,7 +1569,8 @@ static int packed_delete_refs(struct ref_store *ref_store, const char *msg,
15681569
return ret;
15691570
}
15701571

1571-
static int packed_pack_refs(struct ref_store *ref_store, unsigned int flags)
1572+
static int packed_pack_refs(struct ref_store *UNUSED(ref_store),
1573+
unsigned int UNUSED(flags))
15721574
{
15731575
/*
15741576
* Packed refs are already packed. It might be that loose refs
@@ -1578,7 +1580,7 @@ static int packed_pack_refs(struct ref_store *ref_store, unsigned int flags)
15781580
return 0;
15791581
}
15801582

1581-
static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_store)
1583+
static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *UNUSED(ref_store))
15821584
{
15831585
return empty_ref_iterator_begin();
15841586
}

0 commit comments

Comments
 (0)