6271160 gcc and cmd/groups don't get along

6271163 gcc and cmd/grpck don't get along
6272057 gcc and cmd/oamuser don't get along
6272073 gcc and cmd/passmgmt don't get along
6272075 gcc and cmd/passwd don't get along
6272665 gcc and cmd/pwck don't get along
6272669 gcc and cmd/pwconv don't get along

14 files changed, 132 insertions, 159 deletions

diff --git a/usr/src/cmd/groups/groups.c b/usr/src/cmd/groups/groups.c
index c48d66febe..f2da1fa40f 100644
--- a/usr/src/cmd/groups/groups.c
+++ b/usr/src/cmd/groups/groups.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -58,13 +58,11 @@ static void showgroups();
 
 static int ngroups_max;
 
-void
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
-	register int xval = 0;
-	register struct passwd *pw;
+	int xval = 0;
+	struct passwd *pw;
 
 	ngroups_max = sysconf(_SC_NGROUPS_MAX);
 
@@ -98,15 +96,14 @@ main(argc, argv)
 		}
 	}
 
-	exit(xval);
+	return (xval);
 
 }
 
 static void
-showgroups(pw)
-	register struct passwd *pw;
+showgroups(struct passwd *pw)
 {
-	register struct group *gr;
+	struct group *gr;
 	static gid_t *groups = NULL;
 	int ngroups;
 	int i;
diff --git a/usr/src/cmd/grpck/grpck.c b/usr/src/cmd/grpck/grpck.c
index 88a3e6f59e..fceaa4002a 100644
--- a/usr/src/cmd/grpck/grpck.c
+++ b/usr/src/cmd/grpck/grpck.c
@@ -23,6 +23,7 @@
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
@@ -66,7 +67,7 @@ char *nptr;
 char *cptr;
 FILE *fptr;
 gid_t gid;
-int error();
+void error(char *msg);
 
 struct group {
 	struct group *nxt;
@@ -82,7 +83,7 @@ struct node {
 };
 
 void *
-emalloc(size)
+emalloc(size_t size)
 {
 	void *vp;
 	vp = malloc(size);
@@ -93,9 +94,8 @@ emalloc(size)
 	return (vp);
 }
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char *argv[])
 {
 	struct passwd *pwp;
 	struct node *root = NULL;
@@ -387,14 +387,13 @@ getnext:
 			}
 		}
 	}
-	exit(code);
+	return (code);
 }
 
 /*	Error printing routine	*/
 
-error(msg)
-
-char *msg;
+void
+error(char *msg)
 {
 	code = 1;
 	if (eflag == 0)
diff --git a/usr/src/cmd/oamuser/group/groupadd.c b/usr/src/cmd/oamuser/group/groupadd.c
index 6b66a0c378..8f6b924280 100644
--- a/usr/src/cmd/oamuser/group/groupadd.c
+++ b/usr/src/cmd/oamuser/group/groupadd.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -28,7 +28,7 @@
 /*	  All Rights Reserved  	*/
 
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.4 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include	<sys/types.h>
 #include	<stdio.h>
@@ -56,14 +56,13 @@ extern int valid_gid(), add_group();
 
 char *cmdname = "groupadd";
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char *argv[])
 {
 	int ch;				/* return from getopt */
 	gid_t gid;			/* group id */
 	int oflag = 0;	/* flags */
-	register rc;
+	int rc;
 	char *gidstr = NULL;	/* gid from command line */
 	char *grpname;			/* group name from command line */
 	int warning;
diff --git a/usr/src/cmd/oamuser/group/groupdel.c b/usr/src/cmd/oamuser/group/groupdel.c
index 23901f6e29..0b15061266 100644
--- a/usr/src/cmd/oamuser/group/groupdel.c
+++ b/usr/src/cmd/oamuser/group/groupdel.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -28,7 +28,7 @@
 /*	  All Rights Reserved  	*/
 
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.3 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -48,12 +48,11 @@ char *cmdname = "groupdel";
 extern void errmsg(), exit();
 extern int del_group();
 
-main(argc, argv)
-int argc;
-char **argv;
+int
+main(int argc, char **argv)
 {
-	register char *group;		/* group name from command line */
-	register retval = 0;
+	char *group;		/* group name from command line */
+	int retval = 0;
 
 	if (argc != 2) {
 		errmsg(M_DUSAGE);
diff --git a/usr/src/cmd/oamuser/group/groupmod.c b/usr/src/cmd/oamuser/group/groupmod.c
index 616d35ba7e..d7a9b4501f 100644
--- a/usr/src/cmd/oamuser/group/groupmod.c
+++ b/usr/src/cmd/oamuser/group/groupmod.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -28,7 +28,7 @@
 /*	  All Rights Reserved  	*/
 
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.3 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -57,9 +57,8 @@ extern void errmsg();
 
 char *cmdname = "groupmod";
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char *argv[])
 {
 	int ch;				/* return from getopt */
 	gid_t gid;			/* group id */
diff --git a/usr/src/cmd/oamuser/user/homedir.c b/usr/src/cmd/oamuser/user/homedir.c
index ce32a13bff..db56c9c885 100644
--- a/usr/src/cmd/oamuser/user/homedir.c
+++ b/usr/src/cmd/oamuser/user/homedir.c
@@ -19,15 +19,16 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
@@ -48,11 +49,11 @@ static char cmdbuf[ SBUFSZ ];	/* buffer for system call */
 	directory.
 */
 int
-create_home( homedir, skeldir, uid, gid)
-char *homedir;			/* home directory to create */
-char *skeldir;			/* skel directory to copy if indicated */
-uid_t uid;			/* uid of new user */
-gid_t gid;			/* group id of new user */
+create_home(char *homedir, char *skeldir, uid_t uid, gid_t gid)
+		/* home directory to create */
+		/* skel directory to copy if indicated */
+		/* uid of new user */
+		/* group id of new user */
 {
 	if( mkdir(homedir, 0775) != 0 ) {
 		errmsg( M_OOPS, "create the home directory", prerrno( errno ) );
@@ -102,8 +103,8 @@ gid_t gid;			/* group id of new user */
 }
 
 /* Remove a home directory structure */
-rm_homedir( dir )
-char *dir;
+int
+rm_homedir(char *dir)
 {
 	(void) sprintf( cmdbuf, "rm -rf %s", dir );
 		
diff --git a/usr/src/cmd/oamuser/user/movedir.c b/usr/src/cmd/oamuser/user/movedir.c
index 218cd36dbb..b5355c37ac 100644
--- a/usr/src/cmd/oamuser/user/movedir.c
+++ b/usr/src/cmd/oamuser/user/movedir.c
@@ -19,15 +19,16 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
@@ -48,13 +49,13 @@ static char cmdbuf[SBUFSZ];	/* buffer for system call */
  *	Move directory contents from one place to another
  */
 int
-move_dir(from, to, login)
-char *from;			/* directory to move files from */
-char *to;			/* dirctory to move files to */
-char *login;			/* login id of owner */
+move_dir(char *from, char *to, char *login)
+		/* directory to move files from */
+		/* dirctory to move files to */
+		/* login id of owner */
 {
 	size_t len = 0;
-	register rc = EX_SUCCESS;
+	int rc = EX_SUCCESS;
 	struct stat statbuf;
 	struct utimbuf times;
 	/*
diff --git a/usr/src/cmd/oamuser/user/userdefs.c b/usr/src/cmd/oamuser/user/userdefs.c
index 7f87c2d14b..4487e2f16d 100644
--- a/usr/src/cmd/oamuser/user/userdefs.c
+++ b/usr/src/cmd/oamuser/user/userdefs.c
@@ -19,17 +19,17 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" /* SVr4.0 1.4 */
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*LINTLIBRARY*/
 
@@ -221,13 +221,10 @@ dup_to_nl(char *from)
 }
 
 void
-dispusrdef(fptr, flags, usertype)
-FILE *fptr;
-unsigned flags;
-char *usertype;
+dispusrdef(FILE *fptr, unsigned flags, char *usertype)
 {
 	struct userdefs *deflts = getusrdef(usertype);
-	register outcount = 0;
+	int outcount = 0;
 
 	/* Print out values */
 
diff --git a/usr/src/cmd/oamuser/user/val_lgrp.c b/usr/src/cmd/oamuser/user/val_lgrp.c
index a2a749eda8..db7c0c0903 100644
--- a/usr/src/cmd/oamuser/user/val_lgrp.c
+++ b/usr/src/cmd/oamuser/user/val_lgrp.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,15 +42,13 @@ extern void exit();
 extern char *strtok();
 
 static gid_t grplist[ NGROUPS_UMAX + 1 ];
-static ngroups_max = 0;
+static int ngroups_max = 0;
 
 /* Validate a list of groups */
 int	**
-valid_lgroup( list, gid )
-char *list;
-gid_t gid;
+valid_lgroup(char *list, gid_t gid)
 {
-	register n_invalid = 0, i = 0, j;
+	int n_invalid = 0, i = 0, j;
 	char *ptr;
 	struct group *g_ptr;
 	int warning;
diff --git a/usr/src/cmd/oamuser/user/val_lprj.c b/usr/src/cmd/oamuser/user/val_lprj.c
index e23e925a63..95b084e9bc 100644
--- a/usr/src/cmd/oamuser/user/val_lprj.c
+++ b/usr/src/cmd/oamuser/user/val_lprj.c
@@ -38,7 +38,7 @@
 
 
 static projid_t projlist[NPROJECTS_MAX + 1];
-static nproj_max = NPROJECTS_MAX;
+static int nproj_max = NPROJECTS_MAX;
 
 /* Validate a list of projects */
 int **
diff --git a/usr/src/cmd/passmgmt/passmgmt.c b/usr/src/cmd/passmgmt/passmgmt.c
index f8e4c6a6f4..1e22bc0c7c 100644
--- a/usr/src/cmd/passmgmt/passmgmt.c
+++ b/usr/src/cmd/passmgmt/passmgmt.c
@@ -110,17 +110,26 @@ char	*msg;			/* pointer to error message	*/
 #define	OUSERATTR_FILENAME	"/etc/ouser_attr"
 #define	USERATTR_TEMP		"/etc/uatmp"
 
+struct uid_blk {
+	struct uid_blk *link;
+	uid_t low;		/* low bound for this uid block */
+	uid_t high;		/* high bound for this uid block */
+};
+
 extern userattr_t *fgetuserattr(FILE *);
 
+
 /*
  * Declare all functions that do not return integers.  This is here
  * to get rid of some lint messages
  */
 
-void	uid_bcom(), add_ublk(), bad_perm(), bad_usage(), bad_arg(),
-	bad_uid(), bad_pasf(), file_error(), bad_news(), no_lock(),
-	add_uid(), rid_tmpf(), ck_p_sz(), ck_s_sz(), bad_name(),
-	bad_uattr();
+void	uid_bcom(struct uid_blk *), add_ublk(uid_t, struct uid_blk *),
+	bad_perm(void),
+	bad_usage(char *), bad_arg(char *), bad_uid(void), bad_pasf(void),
+	file_error(void), bad_news(void), no_lock(void), add_uid(uid_t),
+	rid_tmpf(void), ck_p_sz(struct passwd *), ck_s_sz(struct spwd *),
+	bad_name(char *), bad_uattr(void);
 
 void file_copy(FILE *spf, long NIS_pos);
 
@@ -133,19 +142,13 @@ static int fd_ptemp, fd_stemp, fd_uatemp;
  * used on the system.
  */
 
-struct uid_blk {
-	struct uid_blk *link;
-	uid_t low;		/* low bound for this uid block */
-	uid_t high;		/* high bound for this uid block */
-};
 
 #ifndef att
 /*
  * getspnan routine that ONLY looks at the local shadow file
  */
 struct spwd *
-local_getspnam(name)
-char *name;
+local_getspnam(char *name)
 {
 	FILE *shadf;
 	struct spwd *sp;
@@ -278,9 +281,8 @@ extern int errno;
 int optn_mask = 0, info_mask = 0;
 extern int getdate_err;
 
-main(argc, argv)
-int	argc;
-char  **argv;
+int
+main(int argc, char **argv)
 {
 	int c, i;
 	char *lognamp, *char_p;
@@ -1374,14 +1376,14 @@ char  **argv;
 	/*
 	 * Return 0 status, indicating success
 	 */
-	exit(0);
+	return (0);
 
 }  /* end of main */
 
 /* Try to recover the old password file */
 
 int
-rec_pwd()
+rec_pwd(void)
 {
 	if (unlink(PASSWD) || link(OPASSWD, PASSWD))
 		return (-1);
@@ -1392,8 +1394,7 @@ rec_pwd()
 /* combine two uid_blk's */
 
 void
-uid_bcom(uid_p)
-struct uid_blk *uid_p;
+uid_bcom(struct uid_blk *uid_p)
 {
 	struct uid_blk *uid_tp;
 
@@ -1407,9 +1408,7 @@ struct uid_blk *uid_p;
 /* add a new uid_blk */
 
 void
-add_ublk(num, uid_p)
-uid_t num;
-struct uid_blk *uid_p;
+add_ublk(uid_t num, struct uid_blk *uid_p)
 {
 	struct uid_blk *uid_tp;
 
@@ -1441,8 +1440,7 @@ struct uid_blk *uid_p;
  */
 /* add_uid() adds uid to the link list of used uids */
 void
-add_uid(uid)
-uid_t uid;
+add_uid(uid_t uid)
 {
 	struct uid_blk *uid_p;
 	/* Only keep track of the ones above UID_MIN */
@@ -1501,15 +1499,14 @@ uid_t uid;
 }
 
 void
-bad_perm()
+bad_perm(void)
 {
 	(void) fprintf(stderr, gettext("%s: Permission denied\n"), prognamp);
 	exit(1);
 }
 
 void
-bad_usage(sp)
-char *sp;
+bad_usage(char *sp)
 {
 	if (strlen(sp) != 0)
 		(void) fprintf(stderr, "%s: %s\n", prognamp, gettext(sp));
@@ -1525,8 +1522,7 @@ char *sp;
 }
 
 void
-bad_arg(s)
-char *s;
+bad_arg(char *s)
 {
 	(void) fprintf(stderr, "%s: %s\n", prognamp, gettext(s));
 
@@ -1536,8 +1532,7 @@ char *s;
 }
 
 void
-bad_name(s)
-char *s;
+bad_name(char *s)
 {
 	(void) fprintf(stderr, "%s: %s\n", prognamp, gettext(s));
 	ulckpwdf();
@@ -1545,7 +1540,7 @@ char *s;
 }
 
 void
-bad_uid()
+bad_uid(void)
 {
 	(void) fprintf(stderr, gettext("%s: UID in use\n"), prognamp);
 
@@ -1554,7 +1549,7 @@ bad_uid()
 }
 
 void
-bad_pasf()
+bad_pasf(void)
 {
 	msg = "%s: Inconsistent password files\n";
 	(void) fprintf(stderr, gettext(msg), prognamp);
@@ -1564,7 +1559,7 @@ bad_pasf()
 }
 
 void
-bad_uattr()
+bad_uattr(void)
 {
 	msg = "%s: Bad user_attr database\n";
 	(void) fprintf(stderr, gettext(msg), prognamp);
@@ -1574,7 +1569,7 @@ bad_uattr()
 }
 
 void
-file_error()
+file_error(void)
 {
 	msg = "%s: Unexpected failure.	Password files unchanged\n";
 	(void) fprintf(stderr, gettext(msg), prognamp);
@@ -1584,7 +1579,7 @@ file_error()
 }
 
 void
-bad_news()
+bad_news(void)
 {
 	msg = "%s: Unexpected failure.	Password file(s) missing\n";
 	(void) fprintf(stderr, gettext(msg), prognamp);
@@ -1594,7 +1589,7 @@ bad_news()
 }
 
 void
-no_lock()
+no_lock(void)
 {
 	msg = "%s: Password file(s) busy.  Try again later\n";
 	(void) fprintf(stderr, gettext(msg), prognamp);
@@ -1604,8 +1599,7 @@ no_lock()
 
 /* Check for the size of the whole passwd entry */
 void
-ck_p_sz(pwp)
-struct passwd *pwp;
+ck_p_sz(struct passwd *pwp)
 {
 	char ctp[128];
 
@@ -1626,8 +1620,7 @@ struct passwd *pwp;
 
 /* Check for the size of the whole passwd entry */
 void
-ck_s_sz(ssp)
-struct spwd *ssp;
+ck_s_sz(struct spwd *ssp)
 {
 	char ctp[128];
 
@@ -1650,7 +1643,7 @@ struct spwd *ssp;
 
 /* Get rid of the temp files */
 void
-rid_tmpf()
+rid_tmpf(void)
 {
 	(void) fclose(fp_ptemp);
 
diff --git a/usr/src/cmd/passwd/passwd.c b/usr/src/cmd/passwd/passwd.c
index 5913ddfcd9..53ecf62c74 100644
--- a/usr/src/cmd/passwd/passwd.c
+++ b/usr/src/cmd/passwd/passwd.c
@@ -179,7 +179,8 @@ static int		pam_retval = PAM_SUCCESS;
 static uid_t		uid;
 static char		*prognamep;
 static long		maxdate;	/* password aging information */
-static int		passwd_conv();
+static int		passwd_conv(int, struct pam_message **,
+			    struct pam_response **, void *);
 static struct pam_conv	pam_conv = {passwd_conv, NULL};
 static pam_handle_t	*pamh;		/* Authentication handle */
 static char		*usrname;	/* user whose attribute we update */
@@ -199,7 +200,7 @@ extern	void		setusershell(void);
 extern	char		*getusershell(void);
 extern	void		endusershell(void);
 
-static	void		passwd_exit(int retcode);
+static	void		passwd_exit(int retcode) __NORETURN;
 static	void		rusage(void);
 static	int		ckuid(void);
 static	int		ckarg(int argc, char **argv, attrlist **attributes);
@@ -225,10 +226,8 @@ static	char		*getresponse(char *);
  * 	password attributes which corresponds to their login name.
  */
 
-void
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 
 	int	flag;
@@ -502,6 +501,8 @@ main(argc, argv)
 		}
 		(void) passwd_exit(retval);
 	}
+	/* NOTREACHED */
+	return (0);
 }
 
 /*
@@ -1224,7 +1225,7 @@ ckarg(int argc, char **argv, attrlist **attributes)
  */
 
 static int
-ckuid()
+ckuid(void)
 {
 	if (uid != 0) {
 		return (retval = NOPERM);
@@ -1347,9 +1348,7 @@ free_attr(attrlist *attributes)
  *
  */
 int
-get_namelist_files(namelist_p, num_user)
-	char ***namelist_p;
-	int *num_user;
+get_namelist_files(char ***namelist_p, int *num_user)
 {
 	FILE		*pwfp;
 	struct passwd	*pwd;
@@ -1416,8 +1415,7 @@ static DEFINE_NSS_DB_ROOT(db_root);
 static DEFINE_NSS_GETENT(context);
 
 static void
-_np_nss_initf_shadow(p)
-	nss_db_params_t	*p;
+_np_nss_initf_shadow(nss_db_params_t *p)
 {
 	p->name	= NSS_DBNAM_SHADOW;
 	p->config_name    = NSS_DBNAM_PASSWD;	/* Use config for "passwd" */
@@ -1426,23 +1424,20 @@ _np_nss_initf_shadow(p)
 }
 
 static void
-_np_setspent()
+_np_setspent(void)
 {
 	nss_setent(&db_root, _np_nss_initf_shadow, &context);
 }
 
 static void
-_np_endspent()
+_np_endspent(void)
 {
 	nss_endent(&db_root, _np_nss_initf_shadow, &context);
 	nss_delete(&db_root);
 }
 
 static struct spwd *
-_np_getspent_r(result, buffer, buflen)
-	struct spwd	*result;
-	char		*buffer;
-	int		buflen;
+_np_getspent_r(struct spwd *result, char *buffer, int buflen)
 {
 	nss_XbyY_args_t arg;
 	char		*nam;
@@ -1464,7 +1459,7 @@ _np_getspent_r(result, buffer, buflen)
 static nss_XbyY_buf_t *buffer;
 
 static struct spwd *
-_np_getspent()
+_np_getspent(void)
 {
 	nss_XbyY_buf_t	*b;
 
@@ -1531,8 +1526,7 @@ get_namelist(pwu_repository_t repository, char ***namelist, int *num_user)
  */
 
 void
-passwd_exit(retcode)
-	int	retcode;
+passwd_exit(int retcode)
 {
 
 	if (pamh)
@@ -1598,11 +1592,8 @@ passwd_exit(retcode)
 
 /*ARGSUSED*/
 static int
-passwd_conv(num_msg, msg, response, appdata_ptr)
-	int num_msg;
-	struct pam_message **msg;
-	struct pam_response **response;
-	void *appdata_ptr;
+passwd_conv(int num_msg, struct pam_message **msg,
+	    struct pam_response **response, void *appdata_ptr)
 {
 	struct pam_message	*m;
 	struct pam_response	*r;
@@ -1779,7 +1770,7 @@ attrlist_reorder(attrlist **l)
 }
 
 void
-rusage()
+rusage(void)
 {
 
 #define	MSG(a) (void) fprintf(stderr, gettext((a)));
diff --git a/usr/src/cmd/pwck/pwck.c b/usr/src/cmd/pwck/pwck.c
index 8f16ce52f0..efe528bf9c 100644
--- a/usr/src/cmd/pwck/pwck.c
+++ b/usr/src/cmd/pwck/pwck.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1995-2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -61,6 +61,7 @@ static int lc;
 static char buf[512];
 static void error(char *);
 
+int
 main(int argc, char **argv)
 {
 	int delim[512];
diff --git a/usr/src/cmd/pwconv/pwconv.c b/usr/src/cmd/pwconv/pwconv.c
index 6c4584fb23..f03b6e84e5 100644
--- a/usr/src/cmd/pwconv/pwconv.c
+++ b/usr/src/cmd/pwconv/pwconv.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -63,14 +63,13 @@
 
 char pwdflr[]	= "x";				/* password filler */
 char *prognamp;
-void f_err(), f_miss(), f_bdshw();
+void f_err(void), f_miss(void), f_bdshw(void);
 
 /*
  * getspnan routine that ONLY looks at the local shadow file
  */
 struct spwd *
-local_getspnam(name)
-char *name;
+local_getspnam(char *name)
 {
 	FILE *shadf;
 	struct spwd * sp;
@@ -89,17 +88,16 @@ char *name;
 	return (sp);
 }
 
-main(argc, argv)
-int argc;
-char **argv;
+int
+main(int argc, char **argv)
 {
 	extern	int	errno;
-	void  no_recover(), no_convert();
+	void  no_recover(void), no_convert(void);
 	struct  passwd  *pwdp;
 	struct	spwd	*sp, sp_pwd;		/* default entry */
 	struct stat buf;
 	FILE	*tp_fp, *tsp_fp;
-	register time_t	when, minweeks, maxweeks;
+	time_t	when, minweeks, maxweeks;
 	int file_exist = 1;
 	int end_of_file = 0;
 	mode_t mode;
@@ -461,11 +459,11 @@ char **argv;
 		(void) unlink(OPASSWD);
 
 	(void) ulckpwdf();
-	exit(0);
+	return (0);
 }
 
 void
-no_recover()
+no_recover(void)
 {
 	DELPTMP();
 	DELSHWTMP();
@@ -473,7 +471,7 @@ no_recover()
 }
 
 void
-no_convert()
+no_convert(void)
 {
 	DELPTMP();
 	DELSHWTMP();
@@ -481,7 +479,7 @@ no_convert()
 }
 
 void
-f_err()
+f_err(void)
 {
 	fprintf(stderr,
 		gettext("%s: Unexpected failure. Conversion not done.\n"),
@@ -490,7 +488,7 @@ f_err()
 }
 
 void
-f_miss()
+f_miss(void)
 {
 	fprintf(stderr,
 		gettext("%s: Unexpected failure. Password file(s) missing.\n"),
@@ -499,7 +497,7 @@ f_miss()
 }
 
 void
-f_bdshw()
+f_bdshw(void)
 {
 	fprintf(stderr,
 		gettext("%s: Bad entry in /etc/shadow. Conversion not done.\n"),