summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-07-19 20:36:29 +0200
committerJunio C Hamano <gitster@pobox.com>2016-07-19 11:48:35 -0700
commit8109984d619467ad26c6a76d59b0a5de8a86e6d6 (patch)
treebf026f0165f1b8268089c4ec0e0bb402e3a6ee15
parente46579643d56162299b1756b70d418005351b256 (diff)
downloadgit-8109984d619467ad26c6a76d59b0a5de8a86e6d6.tar.gz
use strbuf_addbuf() for appending a strbuf to another
Use strbuf_addbuf() where possible; it's shorter and more efficient. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--dir.c2
-rw-r--r--path.c2
-rw-r--r--wt-status.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index 88e89585eb..05b98843ee 100644
--- a/dir.c
+++ b/dir.c
@@ -2346,7 +2346,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
varint_len = encode_varint(untracked->ident.len, varbuf);
strbuf_add(out, varbuf, varint_len);
- strbuf_add(out, untracked->ident.buf, untracked->ident.len);
+ strbuf_addbuf(out, &untracked->ident);
strbuf_add(out, ouc, ouc_size(len));
free(ouc);
diff --git a/path.c b/path.c
index 38f2ebd6bf..e1bc8f04fe 100644
--- a/path.c
+++ b/path.c
@@ -246,7 +246,7 @@ static void do_submodule_path(struct strbuf *buf, const char *path,
strbuf_addstr(buf, git_dir);
}
strbuf_addch(buf, '/');
- strbuf_addstr(&git_submodule_dir, buf->buf);
+ strbuf_addbuf(&git_submodule_dir, buf);
strbuf_vaddf(buf, fmt, args);
diff --git a/wt-status.c b/wt-status.c
index ced53dd1d4..51c0d7fea7 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1060,7 +1060,7 @@ static void abbrev_sha1_in_line(struct strbuf *line)
strbuf_addf(split[1], "%s ", abbrev);
strbuf_reset(line);
for (i = 0; split[i]; i++)
- strbuf_addf(line, "%s", split[i]->buf);
+ strbuf_addbuf(line, split[i]);
}
}
for (i = 0; split[i]; i++)