[PATCH v2 02/19] sha1_name: simplify via strbuf_set()

[Jeremiah Mahler]

Simplify cases where a strbuf_reset is immediately followed by a
strbuf_add by using strbuf_set operations.

Signed-off-by: Jeremiah Mahler <jmmah...@gmail.com>
---
 sha1_name.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/sha1_name.c b/sha1_name.c
index 2b6322f..f88b66c 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -920,8 +920,7 @@ static int grab_nth_branch_switch(unsigned char *osha1, 
unsigned char *nsha1,
                return 0;
        if (--(cb->remaining) == 0) {
                len = target - match;
-               strbuf_reset(&cb->buf);
-               strbuf_add(&cb->buf, match, len);
+               strbuf_set(&cb->buf, match, len);
                return 1; /* we are done */
        }
        return 0;
@@ -957,8 +956,7 @@ static int interpret_nth_prior_checkout(const char *name, 
int namelen,
 
        retval = 0;
        if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, 
&cb)) {
-               strbuf_reset(buf);
-               strbuf_add(buf, cb.buf.buf, cb.buf.len);
+               strbuf_set(buf, cb.buf.buf, cb.buf.len);
                retval = brace - name + 1;
        }
 
@@ -1025,8 +1023,7 @@ static int interpret_empty_at(const char *name, int 
namelen, int len, struct str
        if (next != name + 1)
                return -1;
 
-       strbuf_reset(buf);
-       strbuf_add(buf, "HEAD", 4);
+       strbuf_set(buf, "HEAD", 4);
        return 1;
 }
 
@@ -1044,8 +1041,7 @@ static int reinterpret(const char *name, int namelen, int 
len, struct strbuf *bu
                strbuf_setlen(buf, used);
                return len;
        }
-       strbuf_reset(buf);
-       strbuf_addbuf(buf, &tmp);
+       strbuf_setbuf(buf, &tmp);
        strbuf_release(&tmp);
        /* tweak for size of {-N} versus expanded ref name */
        return ret - used + len;
@@ -1054,8 +1050,7 @@ static int reinterpret(const char *name, int namelen, int 
len, struct strbuf *bu
 static void set_shortened_ref(struct strbuf *buf, const char *ref)
 {
        char *s = shorten_unambiguous_ref(ref, 0);
-       strbuf_reset(buf);
-       strbuf_addstr(buf, s);
+       strbuf_setstr(buf, s);
        free(s);
 }
 
-- 
2.0.0.592.gf55b190

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html