From: Seija <doremylover123@xxxxxxxxx> We can avoid having to call memset by calling xcalloc directly Signed-off-by: Seija doremylover123@xxxxxxxxx --- maintenance: use xcalloc instead of xmalloc where possible We can avoid having to call memset by calling xcalloc directly Signed-off-by: Seija doremylover123@xxxxxxxxx Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1390%2FAtariDreams%2Fcalloc-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1390/AtariDreams/calloc-v2 Pull-Request: https://github.com/git/git/pull/1390 Range-diff vs v1: 1: f56282194a7 ! 1: ee8a7af6435 maintenance: use xcalloc instead of xmalloc where possible @@ remote.c: 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)); -+ struct remote_state *r = xcalloc(1, 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); ## submodule.c ## -@@ submodule.c: static const struct submodule *get_non_gitmodules_submodule(const char *path) +@@ submodule.c: 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)); -+ ret = xcalloc(1, sizeof(*ret)); ++ CALLOC_ARRAY(ret, 1); ret->path = name; ret->name = name; remote.c | 4 ++-- submodule.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/remote.c b/remote.c index 60869beebe7..475a1d18af0 100644 --- a/remote.c +++ b/remote.c @@ -2741,9 +2741,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 8ac2fca855d..d43774c7527 100644 --- a/submodule.c +++ b/submodule.c @@ -1458,14 +1458,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; base-commit: 805265fcf7a737664a8321aaf4a0587b78435184 -- gitgitgadget