Re: [PATCH] use strbuf_addstr() instead of strbuf_addf() with "%s"

[Johannes Schindelin]

Hi René,

On Fri, 5 Aug 2016, René Scharfe wrote:

> Call strbuf_addstr() for adding a simple string to a strbuf instead of
> using the heavier strbuf_addf().  This is shorter and documents the
> intent more clearly.

Looks obviously good, thanks!

Ciao,
Dscho

[PATCH] use strbuf_addstr() instead of strbuf_addf() with "%s"

[René Scharfe]

Call strbuf_addstr() for adding a simple string to a strbuf instead of
using the heavier strbuf_addf().  This is shorter and documents the
intent more clearly.

Signed-off-by: Rene Scharfe 
---
 builtin/fmt-merge-msg.c | 2 +-
 http.c  | 2 +-
 sequencer.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index e5658c3..ac84e99 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -272,7 +272,7 @@ static int cmp_string_list_util_as_integral(const void *a_, 
const void *b_)
 static void add_people_count(struct strbuf *out, struct string_list *people)
 {
if (people->nr == 1)
-   strbuf_addf(out, "%s", people->items[0].string);
+   strbuf_addstr(out, people->items[0].string);
else if (people->nr == 2)
strbuf_addf(out, "%s (%d) and %s (%d)",
people->items[0].string,
diff --git a/http.c b/http.c
index e81dd13..cd40b01 100644
--- a/http.c
+++ b/http.c
@@ -1225,7 +1225,7 @@ void append_remote_object_url(struct strbuf *buf, const 
char *url,
 
strbuf_addf(buf, "objects/%.*s/", 2, hex);
if (!only_two_digit_prefix)
-   strbuf_addf(buf, "%s", hex+2);
+   strbuf_addstr(buf, hex + 2);
 }
 
 char *get_remote_object_url(const char *url, const char *hex,
diff --git a/sequencer.c b/sequencer.c
index cdfac82..7b1eb14 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -112,7 +112,7 @@ static void remove_sequencer_state(void)
 {
struct strbuf seq_dir = STRBUF_INIT;
 
-   strbuf_addf(_dir, "%s", git_path(SEQ_DIR));
+   strbuf_addstr(_dir, git_path(SEQ_DIR));
remove_dir_recursively(_dir, 0);
strbuf_release(_dir);
 }
-- 
2.9.2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html