{"thread":{"id":"37091","subject":"[PATCH] use strbuf_addbuf for adding strbufs","startedAt":"2014-07-10T08:52:21Z","lastAt":"2014-07-10T08:52:21Z","messageCount":1,"participants":["René Scharfe"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"245681","messageId":"53BE5445.20401@web.de","threadId":"37091","inReplyTo":null,"subject":"[PATCH] use strbuf_addbuf for adding strbufs","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2014-07-10T08:52:21Z","receivedAt":"2014-07-10T08:52:21Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Signed-off-by: Rene Scharfe <l.s.r@web.de>\n---\n builtin/log.c | 2 +-\n pretty.c      | 2 +-\n rerere.c      | 4 ++--\n sha1_name.c   | 2 +-\n 4 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/log.c b/builtin/log.c\nindex 27c1b65..4389722 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -861,7 +861,7 @@ static void add_branch_description(struct strbuf *buf, const char *branch_name)\n \tread_branch_desc(&desc, branch_name);\n \tif (desc.len) {\n \t\tstrbuf_addch(buf, '\\n');\n-\t\tstrbuf_add(buf, desc.buf, desc.len);\n+\t\tstrbuf_addbuf(buf, &desc);\n \t\tstrbuf_addch(buf, '\\n');\n \t}\n }\ndiff --git a/pretty.c b/pretty.c\nindex 8d201f6..6e54934 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -1376,7 +1376,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */\n \t\tcase trunc_none:\n \t\t\tbreak;\n \t\t}\n-\t\tstrbuf_addstr(sb, local_sb.buf);\n+\t\tstrbuf_addbuf(sb, &local_sb);\n \t} else {\n \t\tint sb_len = sb->len, offset = 0;\n \t\tif (c->flush_type == flush_left)\ndiff --git a/rerere.c b/rerere.c\nindex d55aa8a..04d923d 100644\n--- a/rerere.c\n+++ b/rerere.c\n@@ -207,11 +207,11 @@ static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_siz\n \t\t\tstrbuf_reset(&one);\n \t\t\tstrbuf_reset(&two);\n \t\t} else if (hunk == RR_SIDE_1)\n-\t\t\tstrbuf_addstr(&one, buf.buf);\n+\t\t\tstrbuf_addbuf(&one, &buf);\n \t\telse if (hunk == RR_ORIGINAL)\n \t\t\t; /* discard */\n \t\telse if (hunk == RR_SIDE_2)\n-\t\t\tstrbuf_addstr(&two, buf.buf);\n+\t\t\tstrbuf_addbuf(&two, &buf);\n \t\telse\n \t\t\trerere_io_putstr(buf.buf, io);\n \t\tcontinue;\ndiff --git a/sha1_name.c b/sha1_name.c\nindex 5bfa841..6ccd3a5 100644\n--- a/sha1_name.c\n+++ b/sha1_name.c\n@@ -946,7 +946,7 @@ static int interpret_nth_prior_checkout(const char *name, int namelen,\n \tretval = 0;\n \tif (0 < for_each_reflog_ent_reverse(\"HEAD\", grab_nth_branch_switch, &cb)) {\n \t\tstrbuf_reset(buf);\n-\t\tstrbuf_add(buf, cb.buf.buf, cb.buf.len);\n+\t\tstrbuf_addbuf(buf, &cb.buf);\n \t\tretval = brace - name + 1;\n \t}\n \n-- \n2.0.0\n"}]}