From 47b0fb885d2a3ce7abe141f12ddac7ca086147bd Mon Sep 17 00:00:00 2001
From: Jan-Simon Pendry <pendry@ucbvax.Berkeley.EDU>
Date: Fri, 1 Apr 1994 14:08:12 -0800
Subject: [PATCH] prettyness police

SCCS-vsn: usr.sbin/pwd_mkdb/pw_scan.c 8.2
---
 usr/src/usr.sbin/pwd_mkdb/pw_scan.c | 39 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/usr/src/usr.sbin/pwd_mkdb/pw_scan.c b/usr/src/usr.sbin/pwd_mkdb/pw_scan.c
index 839ba26eb5..3890840f96 100644
--- a/usr/src/usr.sbin/pwd_mkdb/pw_scan.c
+++ b/usr/src/usr.sbin/pwd_mkdb/pw_scan.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)pw_scan.c	8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pw_scan.c	8.2 (Berkeley) %G%";
 #endif /* not lint */
 
 /*
@@ -15,23 +15,26 @@ static char sccsid[] = "@(#)pw_scan.c	8.1 (Berkeley) %G%";
  */
 
 #include <sys/param.h>
+
+#include <err.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
-extern char *progname;
+#include "pw_scan.h"
 
+int
 pw_scan(bp, pw)
 	char *bp;
 	struct passwd *pw;
 {
-	register long id;
-	register int root;
-	register char *p, *sh;
-	char *getusershell();
+	long id;
+	int root;
+	char *p, *sh;
 
 	if (!(pw->pw_name = strsep(&bp, ":")))		/* login */
 		goto fmt;
@@ -44,13 +47,12 @@ pw_scan(bp, pw)
 		goto fmt;
 	id = atol(p);
 	if (root && id) {
-		(void)fprintf(stderr, "%s: root uid should be 0", progname);
-		return(0);
+		warnx("root uid should be 0");
+		return (0);
 	}
 	if (id > USHRT_MAX) {
-		(void)fprintf(stderr,
-		    "%s: %s > max uid value (%d)", progname, p, USHRT_MAX);
-		return(0);
+		warnx("%s > max uid value (%d)", p, USHRT_MAX);
+		return (0);
 	}
 	pw->pw_uid = id;
 
@@ -58,9 +60,8 @@ pw_scan(bp, pw)
 		goto fmt;
 	id = atol(p);
 	if (id > USHRT_MAX) {
-		(void)fprintf(stderr,
-		    "%s: %s > max gid value (%d)", progname, p, USHRT_MAX);
-		return(0);
+		warnx("%s > max gid value (%d)", p, USHRT_MAX);
+		return (0);
 	}
 	pw->pw_gid = id;
 
@@ -80,9 +81,7 @@ pw_scan(bp, pw)
 	if (root && *p)					/* empty == /bin/sh */
 		for (setusershell();;) {
 			if (!(sh = getusershell())) {
-				(void)fprintf(stderr,
-				    "%s: warning, unknown root shell\n",
-				    progname);
+				warnx("warning, unknown root shell");
 				break;
 			}
 			if (!strcmp(p, sh))
@@ -90,8 +89,8 @@ pw_scan(bp, pw)
 		}
 
 	if (p = strsep(&bp, ":")) {			/* too many */
-fmt:		(void)fprintf(stderr, "%s: corrupted entry\n", progname);
-		return(0);
+fmt:		warnx("corrupted entry");
+		return (0);
 	}
-	return(1);
+	return (1);
 }
-- 
2.20.1