Revert "lib/shadow/: Use pointer to structure"

That change was temporary to allow adding a re-entrant variant of the
function with a small diff.  Remove it now that it's done.

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

lib/shadow/group/sgetgrent.c

@@ -33,28 +33,27 @@ struct group *
 sgetgrent(const char *s)
 {
 	static char          *buf = NULL;
-	static struct group  grent_ = {};
-	struct group         *grent = &grent_;
+	static struct group  grent = {};
 
 	int     e;
 	size_t  n, lssize, size;
 
 	n = strchrcnt(s, ',') + 2;
-	lssize = n * sizeof(char *);  // For 'grent->gr_mem'.
+	lssize = n * sizeof(char *);  // For 'grent.gr_mem'.
 	size = lssize + strlen(s) + 1;
 
 	free(buf);
 	buf = MALLOC(size, char);
 	if (buf == NULL)
 		return NULL;
 
-	e = sgetgrent_r(s, grent, buf, size);
+	e = sgetgrent_r(s, &grent, buf, size);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return grent;
+	return &grent;
 }
 
 

lib/shadow/gshadow/sgetsgent.c

@@ -34,28 +34,27 @@ struct sgrp *
 sgetsgent(const char *s)
 {
 	static char         *buf = NULL;
-	static struct sgrp  sgent_ = {};
-	struct sgrp         *sgent = &sgent_;
+	static struct sgrp  sgent = {};
 
 	int     e;
 	size_t  n, lssize, size;
 
 	n = strchrcnt(s, ',') + 4;
-	lssize = n * sizeof(char *);  // For 'sgent->sg_adm' and 'sgent->sg_mem'
+	lssize = n * sizeof(char *);  // For 'sgent.sg_adm' and 'sgent.sg_mem'
 	size = lssize + strlen(s) + 1;
 
 	free(buf);
 	buf = MALLOC(size, char);
 	if (buf == NULL)
 		return NULL;
 
-	e = sgetsgent_r(s, sgent, buf, size);
+	e = sgetsgent_r(s, &sgent, buf, size);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return sgent;
+	return &sgent;
 }
 
 

lib/shadow/passwd/sgetpwent.c

@@ -33,8 +33,7 @@ struct passwd *
 sgetpwent(const char *s)
 {
 	static char           *buf = NULL;
-	static struct passwd  pwent_ = {};
-	struct passswd        *pwent = &pwent_;
+	static struct passwd  pwent = {};
 
 	int     e;
 	size_t  size;
@@ -46,13 +45,13 @@ sgetpwent(const char *s)
 	if (buf == NULL)
 		return NULL;
 
-	e = sgetpwent_r(s, pwent, buf, size);
+	e = sgetpwent_r(s, &pwent, buf, size);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return pwent;
+	return &pwent;
 }
 
 

lib/shadow/shadow/sgetspent.c

@@ -38,8 +38,7 @@ struct spwd *
 sgetspent(const char *s)
 {
 	static char         *buf = NULL;
-	static struct spwd  spent_ = {};
-	struct spwd         *spent = &spent_;
+	static struct spwd  spent = {};
 
 	int     e;
 	size_t  size;
@@ -51,13 +50,13 @@ sgetspent(const char *s)
 	if (buf == NULL)
 		return NULL;
 
-	e = sgetspent_r(s, spent, buf, size, dummy);
+	e = sgetspent_r(s, &spent, buf, size, dummy);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return spent;
+	return &spent;
 }
 #endif
 

lib/shadow/subid/sgetsient.c

@@ -26,8 +26,7 @@ struct subordinate_range *
 sgetsient(const char *s)
 {
 	static char                      *buf = NULL;
-	static struct subordinate_range  sient_ = {};
-	struct subordinate_range         *sient = &sient_;
+	static struct subordinate_range  sient = {};
 
 	int     e;
 	size_t  size;
@@ -39,13 +38,13 @@ sgetsient(const char *s)
 	if (buf == NULL)
 		return NULL;
 
-	e = sgetsient_r(s, sient, buf, size);
+	e = sgetsient_r(s, &sient, buf, size);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return sient;
+	return &sient;
 }