From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sun, 8 Mar 2009 23:30:25 +0000 (+0000)
Subject: Compile fixes. Fixes warnings.
X-Git-Tag: 4.1.3~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dc04372df58c477353df1fa6017cee7968e3a34;p=thirdparty%2Fshadow.git

Compile fixes. Fixes warnings.
---

diff --git a/src/grpck.c b/src/grpck.c
index da23710b2..e89cbfdd5 100644
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -546,7 +546,7 @@ static void check_grp_file (int *errors, bool *changed)
 		 * Check for invalid user ID.
 		 */
 		if (grp->gr_gid == (gid_t)-1) {
-			printf (_("invalid user ID '%lu'\n"), grp->gr_gid);
+			printf (_("invalid user ID '%lu'\n"), (long unsigned int)grp->gr_gid);
 			*errors += 1;
 		}
 
diff --git a/src/pwck.c b/src/pwck.c
index 1d3118824..81b2b7e57 100644
--- a/src/pwck.c
+++ b/src/pwck.c
@@ -399,7 +399,7 @@ static void check_pw_file (int *errors, bool *changed)
 		 * Check for invalid user ID.
 		 */
 		if (pwd->pw_uid == (uid_t)-1) {
-			printf (_("invalid user ID '%lu'\n"), pwd->pw_uid);
+			printf (_("invalid user ID '%lu'\n"), (long unsigned int)pwd->pw_uid);
 			*errors += 1;
 		}
 
diff --git a/src/useradd.c b/src/useradd.c
index 9753e3575..70d509bbe 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -271,7 +271,7 @@ static struct group *getgr_nam_gid (const char *grname)
 	char *endptr;
 
 	errno = 0;
-	gid = strtoll (grname, &errptr, 10);
+	gid = strtoll (grname, &endptr, 10);
 	if (   ('\0' != *grname)
 	    && ('\0' == *endptr)
 	    && (ERANGE != errno)
@@ -284,10 +284,10 @@ static struct group *getgr_nam_gid (const char *grname)
 static long get_number (const char *numstr)
 {
 	long val;
-	char *errptr;
+	char *endptr;
 
-	val = strtol (numstr, &errptr, 10);
-	if (('\0' == *numstr) || ('\0' != *errptr) || (ERANGE == errno)) {
+	val = strtol (numstr, &endptr, 10);
+	if (('\0' == *numstr) || ('\0' != *endptr) || (ERANGE == errno)) {
 		fprintf (stderr,
 		         _("%s: invalid numeric argument '%s'\n"),
 		         Prog, numstr);
diff --git a/src/usermod.c b/src/usermod.c
index 76c3b4f6e..e8d329f4c 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -196,7 +196,7 @@ static struct group *getgr_nam_gid (const char *grname)
 	char *endptr;
 
 	errno = 0;
-	val = strtoll (grname, &errptr, 10);
+	val = strtoll (grname, &endptr, 10);
 	if (   ('\0' != *grname)
 	    && ('\0' == *endptr)
 	    && (ERANGE != errno)
@@ -787,10 +787,10 @@ static void grp_update (void)
 static long get_number (const char *numstr)
 {
 	long val;
-	char *errptr;
+	char *endptr;
 
-	val = strtol (numstr, &errptr, 10);
-	if (('\0' != *errptr) || (ERANGE == errno)) {
+	val = strtol (numstr, &endptr, 10);
+	if (('\0' != *endptr) || (ERANGE == errno)) {
 		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
 			 numstr);
 		exit (E_BAD_ARG);