git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Rose via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff Hostetler <git@jeffhostetler.com>,
	Rose <83477269+AtariDreams@users.noreply.github.com>,
	Seija <doremylover123@gmail.com>
Subject: [PATCH v2] maintenance: use xcalloc instead of xmalloc where possible
Date: Mon, 05 Dec 2022 15:33:08 +0000	[thread overview]
Message-ID: <pull.1390.v2.git.git.1670254388605.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1390.git.git.1670251713061.gitgitgadget@gmail.com>

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-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1390/AtariDreams/calloc-v2
Pull-Request: https://github.com/git/git/pull/1390

Range-diff vs v1:

 1:  f56282194a7 ! 1:  ee8a7af6435 maintenance: use xcalloc instead of xmalloc where possible
     @@ remote.c: 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));
     -+	struct remote_state *r = xcalloc(1, 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);
      
       ## submodule.c ##
     -@@ submodule.c: static const struct submodule *get_non_gitmodules_submodule(const char *path)
     +@@ submodule.c: 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));
     -+	ret = xcalloc(1, sizeof(*ret));
     ++	CALLOC_ARRAY(ret, 1);
       	ret->path = name;
       	ret->name = name;
       


 remote.c    | 4 ++--
 submodule.c | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/remote.c b/remote.c
index 60869beebe7..475a1d18af0 100644
--- a/remote.c
+++ b/remote.c
@@ -2741,9 +2741,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);
diff --git a/submodule.c b/submodule.c
index 8ac2fca855d..d43774c7527 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1458,14 +1458,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;
 

base-commit: 805265fcf7a737664a8321aaf4a0587b78435184
-- 
gitgitgadget

  parent reply	other threads:[~2022-12-05 15:35 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-05 14:48 [PATCH] maintenance: use xcalloc instead of xmalloc where possible Rose via GitGitGadget
2022-12-05 15:01 ` Jeff Hostetler
2022-12-05 15:33 ` Rose via GitGitGadget [this message]
2022-12-05 16:01   ` [PATCH v3] " Rose via GitGitGadget
2022-12-05 16:12     ` [PATCH v4] maintenance: use calloc instead of malloc " Rose via GitGitGadget
2022-12-06  5:03       ` Junio C Hamano
2022-12-06 17:38       ` [PATCH v5] revision: " Rose via GitGitGadget
2022-12-06 19:44         ` Ævar Arnfjörð Bjarmason
2022-12-06 19:53         ` [PATCH v6] " Rose via GitGitGadget
2022-12-07  8:44           ` Bagas Sanjaya
2024-12-18  0:30           ` [PATCH v7] " AreaZR via GitGitGadget
2024-12-18  0:48             ` [PATCH v8] git: " AreaZR via GitGitGadget
2024-12-18  0:58               ` [PATCH v9] " AreaZR via GitGitGadget
2024-12-18  1:26                 ` [PATCH v10] git: use calloc instead of malloc + memset " AreaZR via GitGitGadget
2024-12-18 15:39                   ` Junio C Hamano
2024-12-18 16:48                   ` [PATCH v11] " AreaZR via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.1390.v2.git.git.1670254388605.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=83477269+AtariDreams@users.noreply.github.com \
    --cc=doremylover123@gmail.com \
    --cc=git@jeffhostetler.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).