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 /builtin | |
| parent | ebc5da3208824e25a89672a3b91bd13629b215fe (diff) | |
| download | git-51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb.tar.gz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clean.c | 3 | ||||
| -rw-r--r-- | builtin/index-pack.c | 3 |
2 files changed, 2 insertions, 4 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; |