git: use calloc instead of malloc + memset where possible

Avoid calling malloc + memset by calling calloc.

Signed-off-by: Seija Kijin <doremylover123@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 10104d11e3cba1908cd35f22b54e167755770404..462ff105273bb5e325d74b058928cea52489aa7d 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -2854,9 +2854,9 @@ void apply_push_cas(struct push_cas_option *cas,
 
 struct remote_state *remote_state_new(void)
 {
-       struct remote_state *r = xmalloc(sizeof(*r));
+       struct remote_state *r;
 
-       memset(r, 0, sizeof(*r));
+       CALLOC_ARRAY(r, 1);
 
        hashmap_init(&r->remotes_hash, remotes_hash_cmp, NULL, 0);
        hashmap_init(&r->branches_hash, branches_hash_cmp, NULL, 0);

diff --git a/submodule.c b/submodule.c
index 7ec564854d03398ff8acf4e280d48125c47f2876..7707c6f48f053d33693873e25230ad185c14b387 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1489,14 +1489,13 @@ struct fetch_task {
  */
 static const struct submodule *get_non_gitmodules_submodule(const char *path)
 {
-       struct submodule *ret = NULL;
+       struct submodule *ret;
        const char *name = default_name_or_path(path);
 
        if (!name)
                return NULL;
 
-       ret = xmalloc(sizeof(*ret));
-       memset(ret, 0, sizeof(*ret));
+       CALLOC_ARRAY(ret, 1);
        ret->path = name;
        ret->name = name;
 
@@ -1536,8 +1535,9 @@ static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf
                                            const char *path,
                                            const struct object_id *treeish_name)
 {
-       struct fetch_task *task = xmalloc(sizeof(*task));
-       memset(task, 0, sizeof(*task));
+       struct fetch_task *task;
+
+       CALLOC_ARRAY(task, 1);
 
        if (validate_submodule_path(path) < 0)
                exit(128);