undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use strbuf_addstr() for adding constant strings to a strbuf

Browse Source 
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 <l.s.r@web.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2016-07-30 19:36:23 +02:00 committed by Junio C Hamano
parent 08df31eecc
commit 02962d3684
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rev-parse.c
View File

@ -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) | (stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0) |
PARSE_OPT_SHELL_EVAL); PARSE_OPT_SHELL_EVAL);
strbuf_addf(&parsed, " --"); strbuf_addstr(&parsed, " --");
sq_quote_argv(&parsed, argv, 0); sq_quote_argv(&parsed, argv, 0);
puts(parsed.buf); puts(parsed.buf);
return 0; return 0;

2
http-push.c
View File

@ -1137,7 +1137,7 @@ static void remote_ls(const char *path, int flags,
ls.userData = userData; ls.userData = userData;
ls.userFunc = userFunc; 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, "Depth: 1");
dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml");

2
send-pack.c
View File

@ -266,7 +266,7 @@ static int generate_push_cert(struct strbuf *req_buf,
struct strbuf cert = STRBUF_INIT; struct strbuf cert = STRBUF_INIT;
int update_seen = 0; 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); strbuf_addf(&cert, "pusher %s ", signing_key);
datestamp(&cert); datestamp(&cert);
strbuf_addch(&cert, '\n'); strbuf_addch(&cert, '\n');

6
t/helper/test-run-command.c
View File

@ -26,7 +26,7 @@ static int parallel_next(struct child_process *cp,
return 0; return 0;
argv_array_pushv(&cp->args, d->argv); 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++; number_callbacks++;
return 1; return 1;
} }
@ -36,7 +36,7 @@ static int no_job(struct child_process *cp,
void *cb, void *cb,
void **task_cb) void **task_cb)
{ {
strbuf_addf(err, "no further jobs available\n"); strbuf_addstr(err, "no further jobs available\n");
return 0; return 0;
} }
@ -45,7 +45,7 @@ static int task_finished(int result,
void *pp_cb, void *pp_cb,
void *pp_task_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; return 1;
} }