strbuf: use strbuf_addstr() for adding C strings

Avoid code duplication and let strbuf_addstr() call strlen() for us.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index 461c3b1cade4a995d3eb3cc212645791245865e0..31d906bbf5973a6aad105ff018b31df951fecec4 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -707,7 +707,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                char *buffer;
                buffer = strstr(use_message_buffer, "\n\n");
                if (buffer)
                char *buffer;
                buffer = strstr(use_message_buffer, "\n\n");
                if (buffer)

-                       strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
+                       strbuf_addstr(&sb, buffer + 2);

                hook_arg1 = "commit";
                hook_arg2 = use_message;
        } else if (fixup_message) {
                hook_arg1 = "commit";
                hook_arg2 = use_message;
        } else if (fixup_message) {

diff --git a/diff.c b/diff.c
index 06bdfb8ae5acab2c6090ca4154a26fca6da8b74c..867f034b8ffc052d28f28a86fd9f52a5aa5b2c82 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -525,9 +525,9 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
        ep += 2; /* skip over @@ */
 
        /* The hunk header in fraginfo color */
        ep += 2; /* skip over @@ */
 
        /* The hunk header in fraginfo color */

-       strbuf_add(&msgbuf, frag, strlen(frag));
+       strbuf_addstr(&msgbuf, frag);

        strbuf_add(&msgbuf, line, ep - line);
        strbuf_add(&msgbuf, line, ep - line);

-       strbuf_add(&msgbuf, reset, strlen(reset));
+       strbuf_addstr(&msgbuf, reset);

 
        /*
         * trailing "\r\n"
 
        /*
         * trailing "\r\n"


@@ -541,15 +541,15 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
                if (*ep != ' ' && *ep != '\t')
                        break;
        if (ep != cp) {
                if (*ep != ' ' && *ep != '\t')
                        break;
        if (ep != cp) {

-               strbuf_add(&msgbuf, plain, strlen(plain));
+               strbuf_addstr(&msgbuf, plain);

                strbuf_add(&msgbuf, cp, ep - cp);
                strbuf_add(&msgbuf, cp, ep - cp);

-               strbuf_add(&msgbuf, reset, strlen(reset));
+               strbuf_addstr(&msgbuf, reset);

        }
 
        if (ep < line + len) {
        }
 
        if (ep < line + len) {

-               strbuf_add(&msgbuf, func, strlen(func));
+               strbuf_addstr(&msgbuf, func);

                strbuf_add(&msgbuf, ep, line + len - ep);
                strbuf_add(&msgbuf, ep, line + len - ep);

-               strbuf_add(&msgbuf, reset, strlen(reset));
+               strbuf_addstr(&msgbuf, reset);

        }
 
        strbuf_add(&msgbuf, line + len, org_len - len);
        }
 
        strbuf_add(&msgbuf, line + len, org_len - len);

diff --git a/path.c b/path.c
index bc804a31b3382e689dd6ff5b4a727b109a691f7a..c3883d43d8de726f0f4f0b38248801916c19ab67 100644 (file)
--- a/path.c
+++ b/path.c
@@ -277,16 +277,16 @@ char *expand_user_path(const char *path)
                        const char *home = getenv("HOME");
                        if (!home)
                                goto return_null;
                        const char *home = getenv("HOME");
                        if (!home)
                                goto return_null;

-                       strbuf_add(&user_path, home, strlen(home));
+                       strbuf_addstr(&user_path, home);

                } else {
                        struct passwd *pw = getpw_str(username, username_len);
                        if (!pw)
                                goto return_null;
                } else {
                        struct passwd *pw = getpw_str(username, username_len);
                        if (!pw)
                                goto return_null;

-                       strbuf_add(&user_path, pw->pw_dir, strlen(pw->pw_dir));
+                       strbuf_addstr(&user_path, pw->pw_dir);

                }
                to_copy = first_slash;
        }
                }
                to_copy = first_slash;
        }

-       strbuf_add(&user_path, to_copy, strlen(to_copy));
+       strbuf_addstr(&user_path, to_copy);

        return strbuf_detach(&user_path, NULL);
 return_null:
        strbuf_release(&user_path);
        return strbuf_detach(&user_path, NULL);
 return_null:
        strbuf_release(&user_path);