| Message ID | pull.1390.git.git.1670251713061.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | maintenance: use xcalloc instead of xmalloc where possible | expand |
On 12/5/22 9:48 AM, Rose via GitGitGadget wrote: > From: Seija <doremylover123@gmail.com> > > We can avoid having to call memset by calling xcalloc directly > > Signed-off-by: Seija doremylover123@gmail.com > --- > maintenance: use xcalloc instead of xmalloc where possible > > We can avoid having to call memset by calling xcalloc directly > > Signed-off-by: Seija doremylover123@gmail.com > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1390%2FAtariDreams%2Fcalloc-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1390/AtariDreams/calloc-v1 > Pull-Request: https://github.com/git/git/pull/1390 > > remote.c | 4 +--- > submodule.c | 3 +-- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/remote.c b/remote.c > index 60869beebe7..75315f3563f 100644 > --- a/remote.c > +++ b/remote.c > @@ -2741,9 +2741,7 @@ void apply_push_cas(struct push_cas_option *cas, > > struct remote_state *remote_state_new(void) > { > - struct remote_state *r = xmalloc(sizeof(*r)); > - > - memset(r, 0, sizeof(*r)); > + struct remote_state *r = xcalloc(1, sizeof(*r)); > We have a macro to make this easier and hide the messy details: struct remote_state *r; CALLOC_ARRAY(r, 1); Jeff
diff --git a/remote.c b/remote.c index 60869beebe7..75315f3563f 100644 --- a/remote.c +++ b/remote.c @@ -2741,9 +2741,7 @@ void apply_push_cas(struct push_cas_option *cas, struct remote_state *remote_state_new(void) { - struct remote_state *r = xmalloc(sizeof(*r)); - - memset(r, 0, sizeof(*r)); + struct remote_state *r = xcalloc(1, sizeof(*r)); 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 8ac2fca855d..4ca4f6c6590 100644 --- a/submodule.c +++ b/submodule.c @@ -1464,8 +1464,7 @@ static const struct submodule *get_non_gitmodules_submodule(const char *path) if (!name) return NULL; - ret = xmalloc(sizeof(*ret)); - memset(ret, 0, sizeof(*ret)); + ret = xcalloc(1, sizeof(*ret)); ret->path = name; ret->name = name;