From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "René Scharfe" <l.s.r@web.de>, "Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 1/2] walker: let walker_say take arbitrary formats
Date: Fri, 8 Jul 2016 05:25:23 -0400 [thread overview]
Message-ID: <20160708092522.GA18263@sigill.intra.peff.net> (raw)
In-Reply-To: <20160708092510.GB17072@sigill.intra.peff.net>
We take a printf-style format and a single "char *"
parameter, and the format must therefore have at most one
"%s" in it. Besides being error-prone (and tickling
-Wformat-nonliteral), this is unnecessarily restrictive. We
can just provide the usual varargs interface.
Signed-off-by: Jeff King <peff@peff.net>
---
walker.c | 10 +++++++---
walker.h | 3 ++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/walker.c b/walker.c
index d95b007..2c86e40 100644
--- a/walker.c
+++ b/walker.c
@@ -9,10 +9,14 @@
static unsigned char current_commit_sha1[20];
-void walker_say(struct walker *walker, const char *fmt, const char *hex)
+void walker_say(struct walker *walker, const char *fmt, ...)
{
- if (walker->get_verbosely)
- fprintf(stderr, fmt, hex);
+ if (walker->get_verbosely) {
+ va_list ap;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ }
}
static void report_missing(const struct object *obj)
diff --git a/walker.h b/walker.h
index 95e5765..a869013 100644
--- a/walker.h
+++ b/walker.h
@@ -19,7 +19,8 @@ struct walker {
};
/* Report what we got under get_verbosely */
-void walker_say(struct walker *walker, const char *, const char *);
+__attribute__((format (printf, 2, 3)))
+void walker_say(struct walker *walker, const char *fmt, ...);
/* Load pull targets from stdin */
int walker_targets_stdin(char ***target, const char ***write_ref);
--
2.9.0.393.g704e522
next prev parent reply other threads:[~2016-07-08 9:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 20:02 [PATCH] am: ignore return value of write_file() René Scharfe
2016-07-07 20:31 ` Jeff King
2016-07-08 6:37 ` Johannes Schindelin
2016-07-08 6:56 ` Jeff King
2016-07-08 9:04 ` [PATCH 0/8] write_file cleanups Jeff King
2016-07-08 9:06 ` [PATCH 1/8] config: fix bogus fd check when setting up default config Jeff King
2016-07-08 9:08 ` [PATCH 2/8] am: ignore return value of write_file() Jeff King
2016-07-08 9:08 ` [PATCH 3/8] branch: use non-gentle write_file for branch description Jeff King
2016-07-08 9:09 ` [PATCH 4/8] write_file: drop "gently" form Jeff King
2016-07-08 9:10 ` [PATCH 5/8] write_file: use xopen Jeff King
2016-07-08 9:12 ` [PATCH 6/8] write_file: add pointer+len variant Jeff King
2016-07-08 9:12 ` [PATCH 7/8] write_file: add format attribute Jeff King
2016-07-08 9:25 ` Jeff King
2016-07-08 9:25 ` Jeff King [this message]
2016-07-08 9:25 ` [PATCH 2/2] avoid using sha1_to_hex output as printf format Jeff King
2016-07-08 10:35 ` Jeff King
2016-07-08 17:02 ` Junio C Hamano
2016-07-08 17:09 ` Junio C Hamano
2016-07-08 21:41 ` Jeff King
2016-07-08 9:12 ` [PATCH 8/8] use write_file_buf where applicable Jeff King
2016-07-08 9:16 ` [PATCH 9/8] branch: use write_file_buf instead of write_file Jeff King
2016-07-08 18:44 ` [PATCH 0/8] write_file cleanups René Scharfe
2016-07-09 14:24 ` [PATCH] am: ignore return value of write_file() Johannes Schindelin
2016-07-10 10:53 ` Johannes Schindelin
2016-07-08 6:33 ` Johannes Schindelin
2016-07-08 18:44 ` René Scharfe
2016-07-08 21:51 ` 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=20160708092522.GA18263@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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).