From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 05/21] object-name: mark unused parameters in disambiguate callbacks
Date: Fri, 24 Feb 2023 01:38:30 -0500 [thread overview]
Message-ID: <Y/hbZqVZhRyIlFTk@coredump.intra.peff.net> (raw)
In-Reply-To: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
The object-name disambiguation code triggers a callback for each
possible object id we find. This is really used for two purposes:
- "hint" functions like disambiguate_commit_only report back on
whether the value is usable
- iterator functions like repo_for_each_abbrev() use it to collect
and report matching names.
Compiling with -Wunused-parameter generates several warnings, but
they're distinct for each type. The "hint" functions never look at the
void cb_data pointer; they only care whether the oid matches our hint.
The iterator functions never look at the "struct repository" parameter;
they're just reporting back the oids they see, and always return 0.
So arguably these could be two separate interfaces:
int (*hint)(struct repository *r, const struct object_id *oid);
void (*iter)(const struct object_id *oid, void *cb_data);
But doing so would complicate the disambiguation code, which now has to
accept and call the two different types. Since we can easily squelch the
compiler warnings by annotating the functions, let's just do that.
Signed-off-by: Jeff King <peff@peff.net>
---
object-name.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/object-name.c b/object-name.c
index 2dd1a0f56e..7d1986ad48 100644
--- a/object-name.c
+++ b/object-name.c
@@ -223,15 +223,15 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
static int disambiguate_commit_only(struct repository *r,
const struct object_id *oid,
- void *cb_data_unused)
+ void *cb_data UNUSED)
{
int kind = oid_object_info(r, oid, NULL);
return kind == OBJ_COMMIT;
}
static int disambiguate_committish_only(struct repository *r,
const struct object_id *oid,
- void *cb_data_unused)
+ void *cb_data UNUSED)
{
struct object *obj;
int kind;
@@ -251,15 +251,15 @@ static int disambiguate_committish_only(struct repository *r,
static int disambiguate_tree_only(struct repository *r,
const struct object_id *oid,
- void *cb_data_unused)
+ void *cb_data UNUSED)
{
int kind = oid_object_info(r, oid, NULL);
return kind == OBJ_TREE;
}
static int disambiguate_treeish_only(struct repository *r,
const struct object_id *oid,
- void *cb_data_unused)
+ void *cb_data UNUSED)
{
struct object *obj;
int kind;
@@ -279,7 +279,7 @@ static int disambiguate_treeish_only(struct repository *r,
static int disambiguate_blob_only(struct repository *r,
const struct object_id *oid,
- void *cb_data_unused)
+ void *cb_data UNUSED)
{
int kind = oid_object_info(r, oid, NULL);
return kind == OBJ_BLOB;
@@ -473,7 +473,7 @@ static int collect_ambiguous(const struct object_id *oid, void *data)
return 0;
}
-static int repo_collect_ambiguous(struct repository *r,
+static int repo_collect_ambiguous(struct repository *r UNUSED,
const struct object_id *oid,
void *data)
{
@@ -665,7 +665,7 @@ static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
return 0;
}
-static int repo_extend_abbrev_len(struct repository *r,
+static int repo_extend_abbrev_len(struct repository *r UNUSED,
const struct object_id *oid,
void *cb_data)
{
--
2.39.2.981.g6157336f25
next prev parent reply other threads:[~2023-02-24 6:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 6:34 [PATCH 0/21] more -Wunused-parameter fixes Jeff King
2023-02-24 6:34 ` [PATCH 01/21] ref-filter: drop unused atom parameter from get_worktree_path() Jeff King
2023-02-24 17:53 ` Junio C Hamano
2023-02-24 6:37 ` [PATCH 02/21] ls-refs: drop config caching Jeff King
2023-02-24 6:38 ` [PATCH 03/21] serve: use repository pointer to get config Jeff King
2023-02-24 17:59 ` Junio C Hamano
2023-02-24 6:38 ` [PATCH 04/21] serve: mark unused parameters in virtual functions Jeff King
2023-02-24 6:38 ` Jeff King [this message]
2023-02-24 6:38 ` [PATCH 06/21] http-backend: mark argc/argv unused Jeff King
2023-02-24 6:38 ` [PATCH 07/21] http-backend: mark unused parameters in virtual functions Jeff King
2023-02-24 6:39 ` [PATCH 08/21] ref-filter: mark unused callback parameters Jeff King
2023-02-24 6:39 ` [PATCH 09/21] mark "pointless" data pointers in callbacks Jeff King
2023-02-24 6:39 ` [PATCH 10/21] run-command: mark error routine parameters as unused Jeff King
2023-02-24 6:39 ` [PATCH 11/21] mark unused parameters in signal handlers Jeff King
2023-02-24 6:39 ` [PATCH 12/21] list-objects: mark unused callback parameters Jeff King
2023-02-24 6:39 ` [PATCH 13/21] for_each_object: " Jeff King
2023-02-24 6:39 ` [PATCH 14/21] prio-queue: mark unused parameters in comparison functions Jeff King
2023-02-24 6:39 ` [PATCH 15/21] notes: mark unused callback parameters Jeff King
2023-02-24 6:39 ` [PATCH 16/21] fetch-pack: mark unused parameter in callback function Jeff King
2023-02-24 6:39 ` [PATCH 17/21] rewrite_parents(): mark unused callback parameter Jeff King
2023-02-24 6:39 ` [PATCH 18/21] for_each_commit_graft(): " Jeff King
2023-02-24 6:39 ` [PATCH 19/21] userformat_want_item(): mark unused parameter Jeff King
2023-02-24 6:39 ` [PATCH 20/21] run_processes_parallel: mark unused callback parameters Jeff King
2023-02-24 6:39 ` [PATCH 21/21] help: mark unused parameter in git_unknown_cmd_config() Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y/hbZqVZhRyIlFTk@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).