diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-23 09:32:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-23 09:32:18 -0800 |
| commit | 77edd59394b3200b672c4cfd50e067ddb6193e2b (patch) | |
| tree | 7ae766c84004c4d57b5494b53d80ae4fc1179769 /submodule.c | |
| parent | 88e59f8027ed0260584ccc0abd6fe435031614eb (diff) | |
| parent | 7525cd8c3522827be57915941ebbba859c45ce0b (diff) | |
| download | git-77edd59394b3200b672c4cfd50e067ddb6193e2b.tar.gz | |
Merge branch 'sk/calloc-not-malloc-plus-memset'
Code clean-up.
* sk/calloc-not-malloc-plus-memset:
git: use calloc instead of malloc + memset where possible
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/submodule.c b/submodule.c index ed1441923d..b361076c5b 100644 --- a/submodule.c +++ b/submodule.c @@ -1490,14 +1490,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; @@ -1537,8 +1536,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); |