[PATCH v11] git: use calloc instead of malloc + memset where possible
From: Seija Kijin <doremylover123@gmail.com>
Avoid calling malloc + memset by calling calloc.
Signed-off-by: Seija Kijin <doremylover123@gmail.com>
---
git: use calloc instead of malloc + memset where possible
Avoid calling malloc + memset by calling calloc. cc: Jeff Hostetler
git@jeffhostetler.com cc: Ævar Arnfjörð Bjarmason avarab@gmail.com cc:
Bagas Sanjaya bagasdotme@gmail.comPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1390%2FAreaZR%2Fcalloc-v11
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1390/AreaZR/calloc-v11
Pull-Request: https://github.com/git/git/pull/1390
Range-diff vs v10:
1: d7b7959be0a ! 1: cd18ee951cc git: use calloc instead of malloc + memset where possible
@@ Commit message
Avoid calling malloc + memset by calling calloc.
- Signed-off-by: Seija <doremylover123@gmail.com>
+ Signed-off-by: Seija Kijin <doremylover123@gmail.com>
## remote.c ##
@@ remote.c: void apply_push_cas(struct push_cas_option *cas, remote.c | 4 ++--
submodule.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/remote.c b/remote.c
index 10104d11e3c..462ff105273 100644
--- 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 7ec564854d0..7707c6f48f0 100644
--- 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);
base-commit: d882f382b3d939d90cfa58d17b17802338f05d66
--
gitgitgadget