diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-25 19:09:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 10:49:48 -0700 |
| commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
| tree | 03de8d4160649a0b4c1dd79164d746206743f25d /refs/packed-backend.c | |
| parent | is_path_owned_by_current_uid(): mark "report" parameter as unused (diff) | |
| download | git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.gz git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.zip | |
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
As reported in [1] the "UNUSED(var)" macro introduced in
2174b8c75de (Merge branch 'jk/unused-annotation' into next,
2022-08-24) breaks coccinelle's parsing of our sources in files where
it occurs.
Let's instead partially go with the approach suggested in [2] of
making this not take an argument. As noted in [1] "coccinelle" will
ignore such tokens in argument lists that it doesn't know about, and
it's less of a surprise to syntax highlighters.
This undoes the "help us notice when a parameter marked as unused is
actually use" part of 9b240347543 (git-compat-util: add UNUSED macro,
2022-08-19), a subsequent commit will further tweak the macro to
implement a replacement for that functionality.
1. https://lore.kernel.org/git/220825.86ilmg4mil.gmgdl@evledraar.gmail.com/
2. https://lore.kernel.org/git/220819.868rnk54ju.gmgdl@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs/packed-backend.c')
| -rw-r--r-- | refs/packed-backend.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/refs/packed-backend.c b/refs/packed-backend.c index a45bb686f0..43cdb97f8b 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -726,7 +726,7 @@ static struct snapshot *get_snapshot(struct packed_ref_store *refs) } static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname, - struct object_id *oid, struct strbuf *UNUSED(referent), + struct object_id *oid, struct strbuf *referent UNUSED, unsigned int *type, int *failure_errno) { struct packed_ref_store *refs = @@ -1078,8 +1078,8 @@ int packed_refs_is_locked(struct ref_store *ref_store) static const char PACKED_REFS_HEADER[] = "# pack-refs with: peeled fully-peeled sorted \n"; -static int packed_init_db(struct ref_store *UNUSED(ref_store), - struct strbuf *UNUSED(err)) +static int packed_init_db(struct ref_store *ref_store UNUSED, + struct strbuf *err UNUSED) { /* Nothing to do. */ return 0; @@ -1474,7 +1474,7 @@ failure: static int packed_transaction_abort(struct ref_store *ref_store, struct ref_transaction *transaction, - struct strbuf *UNUSED(err)) + struct strbuf *err UNUSED) { struct packed_ref_store *refs = packed_downcast( ref_store, @@ -1513,7 +1513,7 @@ cleanup: return ret; } -static int packed_initial_transaction_commit(struct ref_store *UNUSED(ref_store), +static int packed_initial_transaction_commit(struct ref_store *ref_store UNUSED, struct ref_transaction *transaction, struct strbuf *err) { @@ -1569,8 +1569,8 @@ static int packed_delete_refs(struct ref_store *ref_store, const char *msg, return ret; } -static int packed_pack_refs(struct ref_store *UNUSED(ref_store), - unsigned int UNUSED(flags)) +static int packed_pack_refs(struct ref_store *ref_store UNUSED, + unsigned int flags UNUSED) { /* * Packed refs are already packed. It might be that loose refs @@ -1580,7 +1580,7 @@ static int packed_pack_refs(struct ref_store *UNUSED(ref_store), return 0; } -static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *UNUSED(ref_store)) +static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_store UNUSED) { return empty_ref_iterator_begin(); } |