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>

diff --git a/dir.c b/dir.c
index 88e89585eb1634e07a9316ccd6caf8ea3643e817..05b98843ee3eb5ef5cf5f99b3ab5b4a866c274e4 100644 (file)
--- 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);
 
        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);
 
        strbuf_add(out, ouc, ouc_size(len));
        free(ouc);

diff --git a/path.c b/path.c
index 38f2ebd6bfad2b1557b06ce34a0154603533dd65..e1bc8f04fe221e3ee14ba3b5cf9606001ee66e6a 100644 (file)
--- 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(buf, git_dir);
        }
        strbuf_addch(buf, '/');

-       strbuf_addstr(&git_submodule_dir, buf->buf);
+       strbuf_addbuf(&git_submodule_dir, buf);

 
        strbuf_vaddf(buf, fmt, args);
 
 
        strbuf_vaddf(buf, fmt, args);
 

diff --git a/wt-status.c b/wt-status.c
index ced53dd1d49eb641f5505a8a75502e95de356c3c..51c0d7fea745c05471527a0f28011c4db32dd822 100644 (file)
--- 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(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++)
                }
        }
        for (i = 0; split[i]; i++)