use xmemdupz() to allocate copies of strings given by start and length

Use xmemdupz() to allocate the memory, copy the data and make sure to
NUL-terminate the result, all in one step.  The resulting code is
shorter, doesn't contain the constants 1 and '\0', and avoids
duplicating function parameters.

For blame, the last copied byte (o->file.ptr[o->file.size]) is always
set to NUL by fake_working_tree_commit() or read_sha1_file(), so no
information is lost by the conversion to using xmemdupz().

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

diff --git a/builtin/apply.c b/builtin/apply.c
index 9c5724eaccfaee62ff10eb097adc39ace351cade..622ee1674af592f4f843577f319c6883a1665f02 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -2869,9 +2869,7 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
        case BINARY_LITERAL_DEFLATED:
                clear_image(img);
                img->len = fragment->size;
        case BINARY_LITERAL_DEFLATED:
                clear_image(img);
                img->len = fragment->size;

-               img->buf = xmalloc(img->len+1);
-               memcpy(img->buf, fragment->patch, img->len);
-               img->buf[img->len] = '\0';
+               img->buf = xmemdupz(fragment->patch, img->len);

                return 0;
        }
        return -1;
                return 0;
        }
        return -1;

diff --git a/builtin/blame.c b/builtin/blame.c
index ef7cb1d254118afa3f241c5ae4236f3b57dda659..6a284ce46b4f3b46a47d033fca607cae710806bc 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2458,11 +2458,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                die("revision walk setup failed");
 
        if (is_null_sha1(sb.final->object.sha1)) {
                die("revision walk setup failed");
 
        if (is_null_sha1(sb.final->object.sha1)) {

-               char *buf;

                o = sb.final->util;
                o = sb.final->util;

-               buf = xmalloc(o->file.size + 1);
-               memcpy(buf, o->file.ptr, o->file.size + 1);
-               sb.final_buf = buf;
+               sb.final_buf = xmemdupz(o->file.ptr, o->file.size);

                sb.final_buf_size = o->file.size;
        }
        else {
                sb.final_buf_size = o->file.size;
        }
        else {

diff --git a/connect.c b/connect.c
index a983d061a90f0b720afa1a9b50247da299164d79..ebc3a5be7d63a68bbaa2d3d6e81ea9191199aee1 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -64,9 +64,7 @@ static void parse_one_symref_info(struct string_list *symref, const char *val, i
        if (!len)
                return; /* just "symref" */
        /* e.g. "symref=HEAD:refs/heads/master" */
        if (!len)
                return; /* just "symref" */
        /* e.g. "symref=HEAD:refs/heads/master" */

-       sym = xmalloc(len + 1);
-       memcpy(sym, val, len);
-       sym[len] = '\0';
+       sym = xmemdupz(val, len);

        target = strchr(sym, ':');
        if (!target)
                /* just "symref=something" */
        target = strchr(sym, ':');
        if (!target)
                /* just "symref=something" */

diff --git a/http-backend.c b/http-backend.c
index d2c0a625cef558df252af6927cd3a86424674862..f6b7a5bae11bddbfc7743efa52b4440449692cb6 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -607,9 +607,7 @@ int main(int argc, char **argv)
 
                        cmd = c;
                        n = out[0].rm_eo - out[0].rm_so;
 
                        cmd = c;
                        n = out[0].rm_eo - out[0].rm_so;

-                       cmd_arg = xmalloc(n);
-                       memcpy(cmd_arg, dir + out[0].rm_so + 1, n-1);
-                       cmd_arg[n-1] = '\0';
+                       cmd_arg = xmemdupz(dir + out[0].rm_so + 1, n - 1);

                        dir[out[0].rm_so] = 0;
                        break;
                }
                        dir[out[0].rm_so] = 0;
                        break;
                }

diff --git a/path.c b/path.c
index f9c5062427e7d8170a1e2e597fcf22ae517a865e..c36f00393007dc2d48a7b7fd765d809fb224d8a4 100644 (file)
--- a/path.c
+++ b/path.c
@@ -249,9 +249,7 @@ int validate_headref(const char *path)
 static struct passwd *getpw_str(const char *username, size_t len)
 {
        struct passwd *pw;
 static struct passwd *getpw_str(const char *username, size_t len)
 {
        struct passwd *pw;

-       char *username_z = xmalloc(len + 1);
-       memcpy(username_z, username, len);
-       username_z[len] = '\0';
+       char *username_z = xmemdupz(username, len);

        pw = getpwnam(username_z);
        free(username_z);
        return pw;
        pw = getpwnam(username_z);
        free(username_z);
        return pw;

diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index 855d28cf9440aba175489b63e5d24665126faf2a..6dd03a974ae9a5063c40cd50e0c6e7645afca971 100644 (file)
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -278,9 +278,7 @@ static string_list_ty variables_set;
 static void
 note_variable (const char *var_ptr, size_t var_len)
 {
 static void
 note_variable (const char *var_ptr, size_t var_len)
 {

-  char *string = xmalloc (var_len + 1);
-  memcpy (string, var_ptr, var_len);
-  string[var_len] = '\0';
+  char *string = xmemdupz (var_ptr, var_len);

 
   string_list_append (&variables_set, string);
 }
 
   string_list_append (&variables_set, string);
 }