From a578617cc00276be61f47cf515962c5ff6bf2bc5 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 4 Feb 2023 21:43:43 +0100
Subject: [PATCH] Use calloc(3) instead of its pattern

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 lib/pwmem.c            | 3 +--
 lib/sgroupio.c         | 3 +--
 lib/shadowmem.c        | 3 +--
 libmisc/find_new_gid.c | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/pwmem.c b/lib/pwmem.c
index 867e3f74..a25e1928 100644
--- a/lib/pwmem.c
+++ b/lib/pwmem.c
@@ -21,12 +21,11 @@
 {
 	struct passwd *pw;
 
-	pw = (struct passwd *) malloc (sizeof *pw);
+	pw = (struct passwd *) calloc (1, sizeof *pw);
 	if (NULL == pw) {
 		return NULL;
 	}
 	/* The libc might define other fields. They won't be copied. */
-	memset (pw, 0, sizeof *pw);
 	pw->pw_uid = pwent->pw_uid;
 	pw->pw_gid = pwent->pw_gid;
 	/*@-mustfreeonly@*/
diff --git a/lib/sgroupio.c b/lib/sgroupio.c
index b4d0589c..ab584c34 100644
--- a/lib/sgroupio.c
+++ b/lib/sgroupio.c
@@ -25,13 +25,12 @@
 	struct sgrp *sg;
 	int i;
 
-	sg = (struct sgrp *) malloc (sizeof *sg);
+	sg = (struct sgrp *) calloc (1, sizeof *sg);
 	if (NULL == sg) {
 		return NULL;
 	}
 	/* Do the same as the other _dup function, even if we know the
 	 * structure. */
-	memset (sg, 0, sizeof *sg);
 	/*@-mustfreeonly@*/
 	sg->sg_name = strdup (sgent->sg_name);
 	/*@=mustfreeonly@*/
diff --git a/lib/shadowmem.c b/lib/shadowmem.c
index 82f99e72..9e46d0ce 100644
--- a/lib/shadowmem.c
+++ b/lib/shadowmem.c
@@ -22,12 +22,11 @@
 {
 	struct spwd *sp;
 
-	sp = (struct spwd *) malloc (sizeof *sp);
+	sp = (struct spwd *) calloc (1, sizeof *sp);
 	if (NULL == sp) {
 		return NULL;
 	}
 	/* The libc might define other fields. They won't be copied. */
-	memset (sp, 0, sizeof *sp);
 	sp->sp_lstchg = spent->sp_lstchg;
 	sp->sp_min    = spent->sp_min;
 	sp->sp_max    = spent->sp_max;
diff --git a/libmisc/find_new_gid.c b/libmisc/find_new_gid.c
index da1d8d55..808cd7ce 100644
--- a/libmisc/find_new_gid.c
+++ b/libmisc/find_new_gid.c
@@ -231,14 +231,13 @@ int find_new_gid (bool sys_group,
 	 */
 
 	/* Create an array to hold all of the discovered GIDs */
-	used_gids = malloc (sizeof (bool) * (gid_max +1));
+	used_gids = calloc (gid_max + 1, sizeof (bool));
 	if (NULL == used_gids) {
 		fprintf (log_get_logfd(),
 			 _("%s: failed to allocate memory: %s\n"),
 			 log_get_progname(), strerror (errno));
 		return -1;
 	}
-	memset (used_gids, false, sizeof (bool) * (gid_max + 1));
 
 	/* First look for the lowest and highest value in the local database */
 	(void) gr_rewind ();