mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sk/calloc-not-malloc-plus-memset'

Browse Source 
Code clean-up.

* sk/calloc-not-malloc-plus-memset:
  git: use calloc instead of malloc + memset where possible
This commit is contained in:
Junio C Hamano
2024-12-23 09:32:18 -08:00
parent 88e59f8027 7525cd8c35
commit 77edd59394
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote.c
View File

@ -2873,9 +2873,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
View File

@ -1490,14 +1490,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;
@ -1537,8 +1536,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);