Skip to contentSkip to conversation

use strbuf_addstr() for adding constant strings to a strbuf

PATCH In review René Scharfe 3 participants 3 messages Jul 30, 2016 – Aug 1, 2016

lore
Share & tools
lore

René Scharfe

author
#0 lore raw

PATCH 1/1 use strbuf_addstr() for adding constant strings to a strbuf

Replace uses of strbuf_addf() for adding strings with more lightweight strbuf_addstr() calls.

In http-push.c it becomes easier to see what's going on without having to verfiy that the definition of PROPFIND_ALL_REQUEST doesn't contain any format specifiers.

Signed-off-by Rene Scharfe <[email protected]>
---
 builtin/rev-parse.c         | 2 +-
 http-push.c                 | 2 +-
 send-pack.c                 | 2 +-
 t/helper/test-run-command.c | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
builtin/rev-parse.c +1 -1
index c961b74..76cf05e 100644
@@ -469,7 +469,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 			(stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0) |
 			PARSE_OPT_SHELL_EVAL);
 
-	strbuf_addf(&parsed, " --");
+	strbuf_addstr(&parsed, " --");
 	sq_quote_argv(&parsed, argv, 0);
 	puts(parsed.buf);
 	return 0;
http-push.c +1 -1
index a092f02..d0b29ac 100644
@@ -1137,7 +1137,7 @@ static void remote_ls(const char *path, int flags,
 	ls.userData = userData;
 	ls.userFunc = userFunc;
 
-	strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST);
+	strbuf_addstr(&out_buffer.buf, PROPFIND_ALL_REQUEST);
 
 	dav_headers = curl_slist_append(dav_headers, "Depth: 1");
 	dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml");
send-pack.c +1 -1
index 299d303..1f85c56 100644
@@ -265,7 +265,7 @@ static int generate_push_cert(struct strbuf *req_buf,
 	struct strbuf cert = STRBUF_INIT;
 	int update_seen = 0;
 
-	strbuf_addf(&cert, "certificate version 0.1\n");
+	strbuf_addstr(&cert, "certificate version 0.1\n");
 	strbuf_addf(&cert, "pusher %s ", signing_key);
 	datestamp(&cert);
 	strbuf_addch(&cert, '\n');
t/helper/test-run-command.c +3 -3
index 30a64a9..6bb53da 100644
@@ -26,7 +26,7 @@ static int parallel_next(struct child_process *cp,
 		return 0;
 
 	argv_array_pushv(&cp->args, d->argv);
-	strbuf_addf(err, "preloaded output of a child\n");
+	strbuf_addstr(err, "preloaded output of a child\n");
 	number_callbacks++;
 	return 1;
 }

@@ -36,7 +36,7 @@ static int no_job(struct child_process *cp,
 		  void *cb,
 		  void **task_cb)
 {
-	strbuf_addf(err, "no further jobs available\n");
+	strbuf_addstr(err, "no further jobs available\n");
 	return 0;
 }
 

@@ -45,7 +45,7 @@ static int task_finished(int result,
 			 void *pp_cb,
 			 void *pp_task_cb)
 {
-	strbuf_addf(err, "asking for a quick stop\n");
+	strbuf_addstr(err, "asking for a quick stop\n");
 	return 1;
 }
Signature · 1 line
2.9.2
#1 lore raw
Quoted 6 lines · René Scharfe

Replace uses of strbuf_addf() for adding strings with more lightweight strbuf_addstr() calls.

In http-push.c it becomes easier to see what's going on without having to verfiy that the definition of PROPFIND_ALL_REQUEST doesn't contain any format specifiers.

Nice. I care a lot less about whether "addf" or "addstr" is more efficient. But the second point, that it makes the intent clearer, is a big win.

-Peff

#2 lore raw
Quoted 5 lines · Jeff King
Quoted 3 lines · René Scharfe

Replace uses of strbuf_addf() for adding strings with more lightweight strbuf_addstr() calls.

Quoted 7 lines
Quoted 3 lines

In http-push.c it becomes easier to see what's going on without having to verfiy that the definition of PROPFIND_ALL_REQUEST doesn't contain any format specifiers.

Nice. I care a lot less about whether "addf" or "addstr" is more efficient. But the second point, that it makes the intent clearer, is a big win.

Yes!