From 51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sat, 19 Jul 2014 15:56:26 +0200 Subject: use xcalloc() to allocate zero-initialized memory Use xcalloc() instead of xmalloc() followed by memset() to allocate and zero out memory because it's shorter and avoids duplicating the function parameters. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- builtin/clean.c | 3 +-- builtin/index-pack.c | 3 +-- compat/mingw.c | 3 +-- pathspec.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 27701d222c..1032563e5f 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -621,8 +621,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff) nr += chosen[i]; } - result = xmalloc(sizeof(int) * (nr + 1)); - memset(result, 0, sizeof(int) * (nr + 1)); + result = xcalloc(nr + 1, sizeof(int)); for (i = 0; i < stuff->nr && j < nr; i++) { if (chosen[i]) result[j++] = i; diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 8b3bd29dbc..9ca0203922 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -362,8 +362,7 @@ static void set_thread_data(struct thread_local *data) static struct base_data *alloc_base_data(void) { - struct base_data *base = xmalloc(sizeof(struct base_data)); - memset(base, 0, sizeof(*base)); + struct base_data *base = xcalloc(1, sizeof(struct base_data)); base->ref_last = -1; base->ofs_last = -1; return base; diff --git a/compat/mingw.c b/compat/mingw.c index e9892f8ee4..363a957a1d 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1226,8 +1226,7 @@ static int WSAAPI getaddrinfo_stub(const char *node, const char *service, else ai->ai_canonname = NULL; - sin = xmalloc(ai->ai_addrlen); - memset(sin, 0, ai->ai_addrlen); + sin = xcalloc(1, ai->ai_addrlen); sin->sin_family = AF_INET; /* Note: getaddrinfo is supposed to allow service to be a string, * which should be looked up using getservbyname. This is diff --git a/pathspec.c b/pathspec.c index 8043099955..0be5edbd13 100644 --- a/pathspec.c +++ b/pathspec.c @@ -389,8 +389,7 @@ void parse_pathspec(struct pathspec *pathspec, if (!(flags & PATHSPEC_PREFER_CWD)) die("BUG: PATHSPEC_PREFER_CWD requires arguments"); - pathspec->items = item = xmalloc(sizeof(*item)); - memset(item, 0, sizeof(*item)); + pathspec->items = item = xcalloc(1, sizeof(*item)); item->match = prefix; item->original = prefix; item->nowildcard_len = item->len = strlen(prefix); -- cgit v1.2.3 From 5c0b13f85ab3a5326508b854768eb70c8829cda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sat, 19 Jul 2014 17:35:34 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/apply.c | 4 +--- builtin/blame.c | 5 +---- connect.c | 4 +--- http-backend.c | 4 +--- path.c | 4 +--- sh-i18n--envsubst.c | 4 +--- 6 files changed, 6 insertions(+), 19 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 9c5724eacc..622ee1674a 100644 --- 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; - 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; diff --git a/builtin/blame.c b/builtin/blame.c index ef7cb1d254..6a284ce46b 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2458,11 +2458,8 @@ parse_done: die("revision walk setup failed"); if (is_null_sha1(sb.final->object.sha1)) { - char *buf; 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 { diff --git a/connect.c b/connect.c index a983d061a9..ebc3a5be7d 100644 --- 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" */ - sym = xmalloc(len + 1); - memcpy(sym, val, len); - sym[len] = '\0'; + sym = xmemdupz(val, len); target = strchr(sym, ':'); if (!target) /* just "symref=something" */ diff --git a/http-backend.c b/http-backend.c index d2c0a625ce..f6b7a5bae1 100644 --- 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_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; } diff --git a/path.c b/path.c index f9c5062427..c36f003930 100644 --- 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; - 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; diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c index 855d28cf94..6dd03a974a 100644 --- 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) { - 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); } -- cgit v1.2.3