{"thread":{"id":"46867","subject":"[PATCH] use strbuf_addstr() for adding strings to strbufs","startedAt":"2017-10-01T14:44:36Z","lastAt":"2017-10-01T14:44:36Z","messageCount":1,"participants":["René Scharfe"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"329282","messageId":"431a993c-fbd4-4bc6-0641-1a69b419cd7f@web.de","threadId":"46867","inReplyTo":null,"subject":"[PATCH] use strbuf_addstr() for adding strings to strbufs","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2017-10-01T14:44:20Z","receivedAt":"2017-10-01T14:44:36Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Use strbuf_addstr() instead of strbuf_addf() for adding strings.  That's\nsimpler and makes the intent clearer.\n\nPatch generated by Coccinelle and contrib/coccinelle/strbuf.cocci;\nadjusted indentation in refs/packed-backend.c manually.\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\n---\n builtin/branch.c      | 2 +-\n refs/packed-backend.c | 4 ++--\n sequencer.c           | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex 355f9ef5da..a2b7c55427 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -352,7 +352,7 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r\n \t\t\tstrbuf_addf(&obname, \"%%(objectname:short=%d)\", filter->abbrev);\n \n \t\tstrbuf_addf(&local, \"%%(align:%d,left)%%(refname:lstrip=2)%%(end)\", maxwidth);\n-\t\tstrbuf_addf(&local, \"%s\", branch_get_color(BRANCH_COLOR_RESET));\n+\t\tstrbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET));\n \t\tstrbuf_addf(&local, \" %s \", obname.buf);\n \n \t\tif (filter->verbose > 1)\ndiff --git a/refs/packed-backend.c b/refs/packed-backend.c\nindex 3bc47ffd5e..2951514f25 100644\n--- a/refs/packed-backend.c\n+++ b/refs/packed-backend.c\n@@ -729,8 +729,8 @@ static int write_with_updates(struct packed_ref_store *refs,\n \t}\n \n \tif (ok != ITER_DONE) {\n-\t\tstrbuf_addf(err, \"unable to write packed-refs file: \"\n-\t\t\t    \"error iterating over old contents\");\n+\t\tstrbuf_addstr(err, \"unable to write packed-refs file: \"\n+\t\t\t      \"error iterating over old contents\");\n \t\tgoto error;\n \t}\n \ndiff --git a/sequencer.c b/sequencer.c\nindex 60636ce54b..ba95cefc7d 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -203,7 +203,7 @@ int sequencer_remove_state(struct replay_opts *opts)\n \t\tfree(opts->xopts[i]);\n \tfree(opts->xopts);\n \n-\tstrbuf_addf(&dir, \"%s\", get_dir(opts));\n+\tstrbuf_addstr(&dir, get_dir(opts));\n \tremove_dir_recursively(&dir, 0);\n \tstrbuf_release(&dir);\n \n-- \n2.14.2\n"}]}