use strbuf_addstr() instead of strbuf_addf() with "%s"

rscharfe · gitster · commit bc57b9c0cc5a · 2016-08-05T15:09:25.000-07:00
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 &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -1105,7 +1105,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
@@ -112,7 +112,7 @@ static void remove_sequencer_state(void)
 {
 	struct strbuf seq_dir = STRBUF_INIT;
 
-	strbuf_addf(&seq_dir, "%s", git_path(SEQ_DIR));
+	strbuf_addstr(&seq_dir, git_path(SEQ_DIR));
 	remove_dir_recursively(&seq_dir, 0);
 	strbuf_release(&seq_dir);
 }

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ static int cmp_string_list_util_as_integral(const void a_, const void b_)`
`272`	`272`	`static void add_people_count(struct strbuf out, struct string_list people)`
`273`	`273`	`{`
`274`	`274`	`if (people->nr == 1)`
`275`		`- strbuf_addf(out, "%s", people->items[0].string);`
	`275`	`+ strbuf_addstr(out, people->items[0].string);`
`276`	`276`	`else if (people->nr == 2)`
`277`	`277`	`strbuf_addf(out, "%s (%d) and %s (%d)",`
`278`	`278`	`people->items[0].string,`
Original file line number	Diff line number	Diff line change
`@@ -1105,7 +1105,7 @@ void append_remote_object_url(struct strbuf buf, const char url,`
`1105`	`1105`
`1106`	`1106`	`strbuf_addf(buf, "objects/%.*s/", 2, hex);`
`1107`	`1107`	`if (!only_two_digit_prefix)`
`1108`		`- strbuf_addf(buf, "%s", hex+2);`
	`1108`	`+ strbuf_addstr(buf, hex + 2);`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`	`1111`	`char get_remote_object_url(const char url, const char *hex,`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static void remove_sequencer_state(void)`
`112`	`112`	`{`
`113`	`113`	`struct strbuf seq_dir = STRBUF_INIT;`
`114`	`114`
`115`		`- strbuf_addf(&seq_dir, "%s", git_path(SEQ_DIR));`
	`115`	`+ strbuf_addstr(&seq_dir, git_path(SEQ_DIR));`
`116`	`116`	`remove_dir_recursively(&seq_dir, 0);`
`117`	`117`	`strbuf_release(&seq_dir);`
`118`	`118`	`}`