From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Derrick Stolee <stolee@gmail.com>
Subject: [PATCH v3 1/8] var: mark unused parameters in git_var callbacks
Date: Tue, 27 Jun 2023 16:18:55 +0000 [thread overview]
Message-ID: <20230627161902.754472-2-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20230627161902.754472-1-sandals@crustytoothpaste.net>
From: Jeff King <peff@peff.net>
We abstract the set of variables into a table, with a "read" callback to
provide the value of each. Each callback takes a "flag" argument, but
most callbacks don't make use of it.
This flag is a bit odd. It may be set to IDENT_STRICT, which make sense
for ident-based callbacks, but is just confusing for things like
GIT_EDITOR.
At first glance, it seems like this is just a hack to let us directly
stick the generic git_committer_info() and git_author_info() functions
into our table. And we'd be better off to wrap them with local functions
which pass IDENT_STRICT, and have our callbacks take no option at all.
But that doesn't quite work. We pass IDENT_STRICT when the caller asks
for a specific variable, but otherwise do not (so that "git var -l" does
not bail if the committer ident cannot be formed).
So we really do need to pass in the flag to each invocation, even if the
individual callback doesn't care about it. Let's mark the unused ones so
that -Wunused-parameter does not complain. And while we're here, let's
rename them so that it's clear that the flag values we get will be from
the IDENT_* set. That may prevent confusion for future readers of the
code.
Another option would be to define our own local "strict" flag for the
callbacks, and then have wrappers that translate that to IDENT_STRICT
where it matters. But that would be more boilerplate for little gain
(most functions would still ignore the "strict" flag anyway).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: brian m. carlson <bk2204@github.com>
---
builtin/var.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/var.c b/builtin/var.c
index 2149998980..10ee62f84c 100644
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -12,17 +12,17 @@
static const char var_usage[] = "git var (-l | <variable>)";
-static const char *editor(int flag)
+static const char *editor(int ident_flag UNUSED)
{
return git_editor();
}
-static const char *sequence_editor(int flag)
+static const char *sequence_editor(int ident_flag UNUSED)
{
return git_sequence_editor();
}
-static const char *pager(int flag)
+static const char *pager(int ident_flag UNUSED)
{
const char *pgm = git_pager(1);
@@ -31,7 +31,7 @@ static const char *pager(int flag)
return pgm;
}
-static const char *default_branch(int flag)
+static const char *default_branch(int ident_flag UNUSED)
{
return git_default_branch_name(1);
}
next prev parent reply other threads:[~2023-06-27 16:19 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 19:50 [PATCH 0/3] Additional variables for git var brian m. carlson
2023-06-22 19:50 ` [PATCH 1/3] var: add support for listing the shell brian m. carlson
2023-06-22 20:42 ` Eric Sunshine
2023-06-22 21:05 ` Junio C Hamano
2023-06-22 21:13 ` Eric Sunshine
2023-06-22 21:25 ` brian m. carlson
2023-06-22 21:41 ` Junio C Hamano
2023-06-22 21:20 ` brian m. carlson
2023-06-22 19:50 ` [PATCH 2/3] var: add attributes files locations brian m. carlson
2023-06-22 20:19 ` Derrick Stolee
2023-06-22 21:17 ` brian m. carlson
2023-06-22 21:37 ` Junio C Hamano
2023-06-22 21:17 ` Junio C Hamano
2023-06-22 21:18 ` Eric Sunshine
2023-06-22 21:30 ` brian m. carlson
2023-06-22 21:21 ` Eric Sunshine
2023-06-22 19:50 ` [PATCH 3/3] var: add config file locations brian m. carlson
2023-06-22 21:35 ` Eric Sunshine
2023-06-26 19:00 ` [PATCH v2 0/7] Additional variables for git var brian m. carlson
2023-06-26 19:00 ` [PATCH v2 1/7] t: add a function to check executable bit brian m. carlson
2023-06-26 19:00 ` [PATCH v2 2/7] var: add support for listing the shell brian m. carlson
2023-06-26 19:00 ` [PATCH v2 3/7] var: format variable structure with C99 initializers brian m. carlson
2023-06-26 19:00 ` [PATCH v2 4/7] var: adjust memory allocation for strings brian m. carlson
2023-06-26 19:56 ` Junio C Hamano
2023-06-26 19:00 ` [PATCH v2 5/7] attr: expose and rename accessor functions brian m. carlson
2023-06-26 19:58 ` Junio C Hamano
2023-06-26 19:00 ` [PATCH v2 6/7] var: add attributes files locations brian m. carlson
2023-06-27 7:05 ` Jeff King
2023-06-27 16:12 ` brian m. carlson
2023-06-27 17:56 ` Junio C Hamano
2023-06-27 20:16 ` Jeff King
2023-06-26 19:00 ` [PATCH v2 7/7] var: add config file locations brian m. carlson
2023-06-26 20:02 ` Junio C Hamano
2023-06-27 16:18 ` [PATCH v3 0/8] Additional variables for git var brian m. carlson
2023-06-27 16:18 ` brian m. carlson [this message]
2023-06-27 16:18 ` [PATCH v3 2/8] t: add a function to check executable bit brian m. carlson
2023-06-27 16:18 ` [PATCH v3 3/8] var: add support for listing the shell brian m. carlson
2023-06-27 16:18 ` [PATCH v3 4/8] var: format variable structure with C99 initializers brian m. carlson
2023-06-27 16:18 ` [PATCH v3 5/8] var: adjust memory allocation for strings brian m. carlson
2023-06-27 16:19 ` [PATCH v3 6/8] attr: expose and rename accessor functions brian m. carlson
2023-06-27 16:19 ` [PATCH v3 7/8] var: add attributes files locations brian m. carlson
2023-06-27 16:19 ` [PATCH v3 8/8] var: add config file locations brian m. carlson
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=20230627161902.754472-2-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
/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 NNTP newsgroup(s).