Skip to content

Commit

Permalink
Merge branch 'sk/calloc-not-malloc-plus-memset'
Browse files Browse the repository at this point in the history
Code clean-up.

* sk/calloc-not-malloc-plus-memset:
  git: use calloc instead of malloc + memset where possible
  • Loading branch information
gitster committed Dec 23, 2024
2 parents 88e59f8 + 7525cd8 commit 77edd59
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -2873,9 +2873,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);
Expand Down
10 changes: 5 additions & 5 deletions submodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 77edd59

Please sign in to comment.