From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 04/21] serve: mark unused parameters in virtual functions
Date: Fri, 24 Feb 2023 01:38:23 -0500 [thread overview]
Message-ID: <Y/hbXxnWeK5DxAXU@coredump.intra.peff.net> (raw)
In-Reply-To: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
Each v2 "serve" action has a virtual function for advertising and
implementing the command. A few of these are so trivial that they don't
need to look at their parameters, especially the "repository" parameter.
We can mark them so that -Wunused-parameter doesn't complain.
Note that upload_pack_v2() probably _should_ be using its repository
pointer. But teaching the functions it calls to do so is non-trivial.
Even using it for something as simple as reading config is tricky, both
because it shares code with the v1 upload pack, and because the
git_protected_config() mechanism it uses does not have a repo-specific
interface. So we'll just annotate it for now, and cleaning it up can be
part of the larger work to drop references to the_repository.
Signed-off-by: Jeff King <peff@peff.net>
---
serve.c | 10 +++++-----
upload-pack.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/serve.c b/serve.c
index 2ccc03c16b..e08a980083 100644
--- a/serve.c
+++ b/serve.c
@@ -12,13 +12,13 @@
static int advertise_sid = -1;
static int client_hash_algo = GIT_HASH_SHA1;
-static int always_advertise(struct repository *r,
- struct strbuf *value)
+static int always_advertise(struct repository *r UNUSED,
+ struct strbuf *value UNUSED)
{
return 1;
}
-static int agent_advertise(struct repository *r,
+static int agent_advertise(struct repository *r UNUSED,
struct strbuf *value)
{
if (value)
@@ -34,7 +34,7 @@ static int object_format_advertise(struct repository *r,
return 1;
}
-static void object_format_receive(struct repository *r,
+static void object_format_receive(struct repository *r UNUSED,
const char *algo_name)
{
if (!algo_name)
@@ -57,7 +57,7 @@ static int session_id_advertise(struct repository *r, struct strbuf *value)
return 1;
}
-static void session_id_receive(struct repository *r,
+static void session_id_receive(struct repository *r UNUSED,
const char *client_sid)
{
if (!client_sid)
diff --git a/upload-pack.c b/upload-pack.c
index bcb702a5ba..f6f4da0fef 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1699,7 +1699,7 @@ enum fetch_state {
FETCH_DONE,
};
-int upload_pack_v2(struct repository *r, struct packet_reader *request)
+int upload_pack_v2(struct repository *r UNUSED, struct packet_reader *request)
{
enum fetch_state state = FETCH_PROCESS_ARGS;
struct upload_pack_data 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 ` Jeff King [this message]
2023-02-24 6:38 ` [PATCH 05/21] object-name: mark unused parameters in disambiguate callbacks Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y/hbXxnWeK5DxAXU@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).