===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/field.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/usr.bin/chpass/field.c	1998/05/29 22:26:46	1.3
+++ src/usr.bin/chpass/field.c	2002/06/27 19:02:40	1.4
@@ -1,4 +1,4 @@
-/*	$OpenBSD: field.c,v 1.3 1998/05/29 22:26:46 downsj Exp $	*/
+/*	$OpenBSD: field.c,v 1.4 2002/06/27 19:02:40 deraadt Exp $	*/
 /*	$NetBSD: field.c,v 1.3 1995/03/26 04:55:28 glass Exp $	*/
 
 /*
@@ -37,8 +37,8 @@
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)field.c	8.4 (Berkeley) 4/2/94";
-#else 
-static char rcsid[] = "$OpenBSD: field.c,v 1.3 1998/05/29 22:26:46 downsj Exp $";
+#else
+static char rcsid[] = "$OpenBSD: field.c,v 1.4 2002/06/27 19:02:40 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,10 +59,7 @@
 
 /* ARGSUSED */
 int
-p_login(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_login(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!*p) {
 		warnx("empty login field");
@@ -88,10 +85,7 @@
 
 /* ARGSUSED */
 int
-p_passwd(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_passwd(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!*p)
 		pw->pw_passwd = "";	/* "NOLOGIN"; */
@@ -99,16 +93,13 @@
 		warnx("can't save password entry");
 		return (1);
 	}
-	
+
 	return (0);
 }
 
 /* ARGSUSED */
 int
-p_uid(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_uid(char *p, struct passwd *pw, ENTRY *ep)
 {
 	uid_t id;
 	char *np;
@@ -133,10 +124,7 @@
 
 /* ARGSUSED */
 int
-p_gid(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_gid(char *p, struct passwd *pw, ENTRY *ep)
 {
 	struct group *gr;
 	gid_t id;
@@ -166,10 +154,7 @@
 
 /* ARGSUSED */
 int
-p_class(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_class(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!*p)
 		pw->pw_class = "";
@@ -177,16 +162,13 @@
 		warnx("can't save entry");
 		return (1);
 	}
-	
+
 	return (0);
 }
 
 /* ARGSUSED */
 int
-p_change(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_change(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!atot(p, &pw->pw_change))
 		return (0);
@@ -196,10 +178,7 @@
 
 /* ARGSUSED */
 int
-p_expire(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_expire(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!atot(p, &pw->pw_expire))
 		return (0);
@@ -209,10 +188,7 @@
 
 /* ARGSUSED */
 int
-p_gecos(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_gecos(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!*p)
 		ep->save = "";
@@ -225,10 +201,7 @@
 
 /* ARGSUSED */
 int
-p_hdir(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_hdir(char *p, struct passwd *pw, ENTRY *ep)
 {
 	if (!*p) {
 		warnx("empty home directory field");
@@ -243,10 +216,7 @@
 
 /* ARGSUSED */
 int
-p_shell(p, pw, ep)
-	char *p;
-	struct passwd *pw;
-	ENTRY *ep;
+p_shell(char *p, struct passwd *pw, ENTRY *ep)
 {
 	char *t;
 
@@ -264,8 +234,7 @@
 			warnx("%s: non-standard shell", p);
 			return (1);
 		}
-	}
-	else
+	} else
 		p = t;
 	if (!(pw->pw_shell = strdup(p))) {
 		warnx("can't save entry");