From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 31 Jul 2023 15:30:59 +0000 (+0200)
Subject: Use CALLOC() instead of its pattern
X-Git-Tag: 4.15.0-rc1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=624bacfbd86eddae09fa08d08685b8f6fcdff9f1;p=thirdparty%2Fshadow.git

Use CALLOC() instead of its pattern

MALLOC() + memset() is simpler written as CALLOC().

Cc: Christian Göttsche <cgzones@googlemail.com>
Cc: Serge Hallyn <serge@hallyn.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/find_new_uid.c b/lib/find_new_uid.c
index fc64bb206..45ce712c9 100644
--- a/lib/find_new_uid.c
+++ b/lib/find_new_uid.c
@@ -232,14 +232,13 @@ int find_new_uid(bool sys_user,
 	 */
 
 	/* Create an array to hold all of the discovered UIDs */
-	used_uids = MALLOC(uid_max + 1, bool);
+	used_uids = CALLOC(uid_max + 1, bool);
 	if (NULL == used_uids) {
 		fprintf (log_get_logfd(),
 			 _("%s: failed to allocate memory: %s\n"),
 			 log_get_progname(), strerror (errno));
 		return -1;
 	}
-	memset (used_uids, false, sizeof (bool) * (uid_max + 1));
 
 	/* First look for the lowest and highest value in the local database */
 	(void) pw_rewind ();
diff --git a/lib/groupmem.c b/lib/groupmem.c
index 271724fbd..eb3348aa5 100644
--- a/lib/groupmem.c
+++ b/lib/groupmem.c
@@ -23,12 +23,11 @@
 	struct group *gr;
 	int i;
 
-	gr = MALLOC(1, struct group);
+	gr = CALLOC(1, struct group);
 	if (NULL == gr) {
 		return NULL;
 	}
 	/* The libc might define other fields. They won't be copied. */
-	memset (gr, 0, sizeof *gr);
 	gr->gr_gid = grent->gr_gid;
 	/*@-mustfreeonly@*/
 	gr->gr_name = strdup (grent->gr_name);