diff options
| author | René Scharfe <l.s.r@web.de> | 2014-07-19 15:56:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 10:30:21 -0700 |
| commit | 51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb (patch) | |
| tree | 8a5a3866741eca992c4555687305c9246fe20eea | |
| parent | ebc5da3208824e25a89672a3b91bd13629b215fe (diff) | |
| download | git-51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb.tar.gz git-51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb.tar.xz | |
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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/clean.c | 3 | ||||
| -rw-r--r-- | builtin/index-pack.c | 3 | ||||
| -rw-r--r-- | compat/mingw.c | 3 | ||||
| -rw-r--r-- | pathspec.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 27701d222..1032563e5 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 8b3bd29db..9ca020392 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 e9892f8ee..363a957a1 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 804309995..0be5edbd1 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); |