use strbuf_addbuf for adding strbufs
Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Jul 10, 2014 at 10:52 UTC
e992d1eb39033206dd44143ff28214b837c3d89f
4 files changed
+5
-5
builtin/log.c
+1
-1
@@ -861,7 +861,7 @@ static void add_branch_description(struct strbuf *buf, const char *branch_name)
861
read_branch_desc(&desc, branch_name);
862
if (desc.len) {
863
strbuf_addch(buf, '\n');
864
- strbuf_add(buf, desc.buf, desc.len);
864
+ strbuf_addbuf(buf, &desc);
865
strbuf_addch(buf, '\n');
866
}
867
}
pretty.c
+1
-1
@@ -1376,7 +1376,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
1376
case trunc_none:
1377
break;
1378
}
1379
- strbuf_addstr(sb, local_sb.buf);
1379
+ strbuf_addbuf(sb, &local_sb);
1380
} else {
1381
int sb_len = sb->len, offset = 0;
1382
if (c->flush_type == flush_left)
rerere.c
+2
-2
@@ -207,11 +207,11 @@ static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_siz
207
strbuf_reset(&one);
208
strbuf_reset(&two);
209
} else if (hunk == RR_SIDE_1)
210
- strbuf_addstr(&one, buf.buf);
210
+ strbuf_addbuf(&one, &buf);
211
else if (hunk == RR_ORIGINAL)
212
; /* discard */
213
else if (hunk == RR_SIDE_2)
214
- strbuf_addstr(&two, buf.buf);
214
+ strbuf_addbuf(&two, &buf);
215
else
216
rerere_io_putstr(buf.buf, io);
217
continue;
sha1_name.c
+1
-1
@@ -946,7 +946,7 @@ static int interpret_nth_prior_checkout(const char *name, int namelen,
946
retval = 0;
947
if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
948
strbuf_reset(buf);
949
- strbuf_add(buf, cb.buf.buf, cb.buf.len);
949
+ strbuf_addbuf(buf, &cb.buf);
950
retval = brace - name + 1;
951
}
952