mirror of
https://github.com/git/git.git
synced 2026-01-10 10:13:33 +00:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
d882f382b3
commit
7525cd8c35
4
remote.c
4
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 *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->remotes_hash, remotes_hash_cmp, NULL, 0);
|
||||||
hashmap_init(&r->branches_hash, branches_hash_cmp, NULL, 0);
|
hashmap_init(&r->branches_hash, branches_hash_cmp, NULL, 0);
|
||||||
|
|||||||
10
submodule.c
10
submodule.c
@@ -1489,14 +1489,13 @@ struct fetch_task {
|
|||||||
*/
|
*/
|
||||||
static const struct submodule *get_non_gitmodules_submodule(const char *path)
|
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);
|
const char *name = default_name_or_path(path);
|
||||||
|
|
||||||
if (!name)
|
if (!name)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
ret = xmalloc(sizeof(*ret));
|
CALLOC_ARRAY(ret, 1);
|
||||||
memset(ret, 0, sizeof(*ret));
|
|
||||||
ret->path = name;
|
ret->path = name;
|
||||||
ret->name = name;
|
ret->name = name;
|
||||||
|
|
||||||
@@ -1536,8 +1535,9 @@ static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf
|
|||||||
const char *path,
|
const char *path,
|
||||||
const struct object_id *treeish_name)
|
const struct object_id *treeish_name)
|
||||||
{
|
{
|
||||||
struct fetch_task *task = xmalloc(sizeof(*task));
|
struct fetch_task *task;
|
||||||
memset(task, 0, sizeof(*task));
|
|
||||||
|
CALLOC_ARRAY(task, 1);
|
||||||
|
|
||||||
if (validate_submodule_path(path) < 0)
|
if (validate_submodule_path(path) < 0)
|
||||||
exit(128);
|
exit(128);
|
||||||
|
|||||||
Reference in New Issue
Block a user