6269760 gcc and cmd/devmgmt don't get along

6271252 gcc and cmd/listen don't get along
6273881 gcc and cmd/soelim don't get along

18 files changed, 220 insertions, 182 deletions

diff --git a/usr/src/cmd/devmgmt/cmds/devattr.c b/usr/src/cmd/devmgmt/cmds/devattr.c
index 7c8fc11996..1627766a81 100644
--- a/usr/src/cmd/devmgmt/cmds/devattr.c
+++ b/usr/src/cmd/devmgmt/cmds/devattr.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -157,9 +157,8 @@ static char	txt[MM_MXTXTLN+1];
  *	4	A requested attribute was not defined for the device
  */
 
-main(argc, argv)
-	int	argc;		/* Number of arguments */
-	char   *argv[];		/* Pointer to arguments */
+int
+main(int argc, char *argv[])
 {
 
 	/* Automatic data */
diff --git a/usr/src/cmd/devmgmt/cmds/devfree.c b/usr/src/cmd/devmgmt/cmds/devfree.c
index 19d84342c8..8d7c10493e 100644
--- a/usr/src/cmd/devmgmt/cmds/devfree.c
+++ b/usr/src/cmd/devmgmt/cmds/devfree.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -131,9 +131,8 @@ static	char	msg[MM_MXTXTLN+1];
  *	EX_NOFREE	3	A requested device couldn't be freed
  */
 
-main(argc, argv)
-	int		argc;		/* Arg count */
-	char	       *argv[];		/* Arg vector */
+int
+main(int argc, char *argv[])
 {
 	/* Automatics */
 	char		      **argp;		/* Ptr to current argument */
diff --git a/usr/src/cmd/devmgmt/cmds/devreserv.c b/usr/src/cmd/devmgmt/cmds/devreserv.c
index 8908dbba76..cf9fdb99ba 100644
--- a/usr/src/cmd/devmgmt/cmds/devreserv.c
+++ b/usr/src/cmd/devmgmt/cmds/devreserv.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -146,9 +146,8 @@ static	char	txt[MM_MXTXTLN+1];
  *				fulfilled.
  */
 
-main(argc, argv)
-	int		argc;		/* Arg count */
-	char	       *argv[];		/* Arg vector */
+int
+main(int argc, char *argv[])
 {
 
 	/* Automatics */
diff --git a/usr/src/cmd/devmgmt/cmds/getdev.c b/usr/src/cmd/devmgmt/cmds/getdev.c
index f3c563c4ab..e8b306f528 100644
--- a/usr/src/cmd/devmgmt/cmds/getdev.c
+++ b/usr/src/cmd/devmgmt/cmds/getdev.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -138,9 +138,8 @@ static	char	txt[MM_MXTXTLN+1];
  *	EX_DEVTAB	The device-table could not be opened for reading
  */
 
-main(argc, argv)
-	int	argc;		/* Number of items on the command line */
-	char  **argv;		/* List of pointers to the arguments */
+int
+main(int argc, char **argv)
 {
 
 	/* 
diff --git a/usr/src/cmd/devmgmt/cmds/getdgrp.c b/usr/src/cmd/devmgmt/cmds/getdgrp.c
index 6b278cad4a..2021c1fcb5 100644
--- a/usr/src/cmd/devmgmt/cmds/getdgrp.c
+++ b/usr/src/cmd/devmgmt/cmds/getdgrp.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 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	*/
@@ -160,9 +160,8 @@ static	char	txt[MM_MXTXTLN+1];
  *		opened for reading
  */
 
-main(argc, argv)
-	int	argc;		/* Number of items on the command line */
-	char  **argv;		/* List of pointers to the arguments */
+int
+main(int argc, char **argv)
 {
 
 	/* 
diff --git a/usr/src/cmd/devmgmt/cmds/getvol.c b/usr/src/cmd/devmgmt/cmds/getvol.c
index 8adae812b4..553a4ba345 100644
--- a/usr/src/cmd/devmgmt/cmds/getvol.c
+++ b/usr/src/cmd/devmgmt/cmds/getvol.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -69,6 +69,7 @@ prog_name(char *arg0)
 	return (arg0);
 }
 
+int
 main(int argc, char **argv)
 {
 	int c, n;
diff --git a/usr/src/cmd/devmgmt/cmds/listdgrp.c b/usr/src/cmd/devmgmt/cmds/listdgrp.c
index d7fa1c178a..7bcbce8115 100644
--- a/usr/src/cmd/devmgmt/cmds/listdgrp.c
+++ b/usr/src/cmd/devmgmt/cmds/listdgrp.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -129,9 +129,8 @@ static	char	msg[MM_MXTXTLN+1];
  *	3	Device group doesn't exist
  */
 
-main(argc, argv)
-	int	argc;			/* Number of items in command */
-	char  **argv;			/* List of pointers to the arguments */
+int
+main(int argc, char **argv)
 {
 
 	/* 
diff --git a/usr/src/cmd/devmgmt/cmds/putdev.c b/usr/src/cmd/devmgmt/cmds/putdev.c
index 732c2cee76..6df19b82fb 100644
--- a/usr/src/cmd/devmgmt/cmds/putdev.c
+++ b/usr/src/cmd/devmgmt/cmds/putdev.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -193,9 +193,8 @@ mklbl(cmd)
  *			for the device and therefore wasn't removed
  */
 
-main(argc, argv)
-	int	argc;			/* Argument count */
-	char   *argv[];			/* Argument list */
+int
+main(int argc, char *argv[])
 {
 	/* Automatic data */
 	char	      **plist;		/* Ptr to list of undef'nd attrs */
diff --git a/usr/src/cmd/devmgmt/cmds/putdgrp.c b/usr/src/cmd/devmgmt/cmds/putdgrp.c
index dd3c3351c2..dc5fe1d0ac 100644
--- a/usr/src/cmd/devmgmt/cmds/putdgrp.c
+++ b/usr/src/cmd/devmgmt/cmds/putdgrp.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -167,9 +167,8 @@ mklbl(cmd)
  * Exit values:
  */
 
-main(argc, argv)
-	int	argc;			/* Argument count */
-	char   *argv[];			/* Argument list */
+int
+main(int argc, char *argv[])
 {
 	/* Automatic data */
 	char	      **plist;		/* Ptr to list of nonmembers */
diff --git a/usr/src/cmd/devmgmt/mkdtab/mkdtab.c b/usr/src/cmd/devmgmt/mkdtab/mkdtab.c
index 66324fa381..f239b0b3e3 100644
--- a/usr/src/cmd/devmgmt/mkdtab/mkdtab.c
+++ b/usr/src/cmd/devmgmt/mkdtab/mkdtab.c
@@ -20,15 +20,12 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 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  	*/
 
-
-/*	#ident	"@(#)devintf:mkdtab/mkdtab.c	1.1.3.1"	*/
-
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include	<stdio.h>
@@ -61,7 +58,7 @@
  */
 #define	ORIGLEN	1024
 
-static struct dpart {
+struct dpart {
 	char	alias[20];
 	char	*cdevice;
 	char	*bdevice;
@@ -536,7 +533,7 @@ checkandresize(int size)
 }
 
 /*ARGSUSED*/
-void
+int
 main(int argc, char **argv)
 {
 	(void) strncpy(cmd, argv[0], 80);
@@ -559,6 +556,6 @@ main(int argc, char **argv)
 	 */
 	mkdgroups();
 
-	exit(0);
+	return (0);
 
 }
diff --git a/usr/src/cmd/listen/listen.c b/usr/src/cmd/listen/listen.c
index b5388e54a5..d210c44e9d 100644
--- a/usr/src/cmd/listen/listen.c
+++ b/usr/src/cmd/listen/listen.c
@@ -19,15 +19,16 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
 
 /*
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.19.9.1	*/
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Network Listener Process
@@ -173,9 +174,21 @@ extern	int	errno;
 #define FALSE	0
 #endif
 
-main(argc, argv)
-int argc;
-char **argv;
+static void mod_prvaddr(void);
+static void pitchcall(struct call_list *pending, struct t_discon *discon);
+static void clr_call(struct t_call *call);
+static void trycon(struct call_list *phead, int fd);
+static void send_dis(struct call_list *phead, int fd);
+static void doevent(struct call_list *phead, int fd);
+static void listen(void);
+static void rst_signals(void);
+static void catch_signals(void);
+static void net_open(void);
+static void init_files(void);
+static void pid_open(void);
+
+int
+main(int argc, char **argv)
 {
 	struct stat buf;
 	int ret;
@@ -190,7 +203,7 @@ char **argv;
 	int	c;
 	extern	char *optarg;
 	extern	int optind;
-	register int i;
+	int i;
 	char	*Mytag_p = Mytag;
 
 	/* Get my port monitor tag out of the environment		*/
@@ -362,7 +375,7 @@ char **argv;
 	logmessage("Initialization Complete");
 
 	listen();
-	exit(0);
+	return (0);
 }
 
 
@@ -376,10 +389,11 @@ char **argv;
 static char *pidopenmsg ="Can't create process ID file in home directory";
 static char *pidlockmsg ="Can't lock PID file: listener may already be running";
 
-pid_open()
+static void
+pid_open(void)
 {
 	int ret;
-	unsigned i;
+	unsigned int i;
 	char pidstring[20];
 
 	if ((Pidfd = open(PIDNAME, PIDOFLAG, PIDMODE)) == -1)  {
@@ -414,7 +428,8 @@ pid_open()
 static char *pmopenmsg = "Can't open pipe to read SAC messages";
 static char *sacopenmsg = "Can't open pipe to respond to SAC messages";
 
-init_files()
+static void
+init_files(void)
 {
 	close(0);
         if ((Acceptfd = open("/dev/null", O_RDWR)) != 0) {
@@ -451,13 +466,14 @@ init_files()
  *		as a developer debugging aid.
  */
 
-net_open()
+static void
+net_open(void)
 {
 #ifdef	CHARADDR
 	char pbuf[NAMEBUFSZ + 1];
 #endif	/* CHARADDR	*/
-	register int i;
-	register dbf_t *dp;
+	int i;
+	dbf_t *dp;
 	char scratch[BUFSIZ];
 
 	DEBUG((9,"in net_open"));
@@ -520,8 +536,8 @@ net_open()
 
 void
 queue(head, cp)
-register struct call_list *head;
-register struct callsave *cp;
+struct call_list *head;
+struct callsave *cp;
 {
 	DEBUG((9,"in queue"));
 	if (head->cl_tail == (struct callsave *) NULL) {
@@ -544,8 +560,8 @@ register struct callsave *cp;
 
 void
 pqueue(head, cp)
-register struct call_list *head;
-register struct callsave *cp;
+struct call_list *head;
+struct callsave *cp;
 {
 	if (head->cl_head == (struct callsave *) NULL) {
 		cp->c_np = (struct callsave *) NULL;
@@ -567,9 +583,9 @@ register struct callsave *cp;
 
 struct callsave *
 dequeue(head)
-register struct call_list *head;
+struct call_list *head;
 {
-	register struct callsave *ret;
+	struct callsave *ret;
 
 	DEBUG((9,"in dequeue"));
 	if (head->cl_head == (struct callsave *) NULL)  {
@@ -621,7 +637,7 @@ int clen;
 unsigned int *conp;
 char **adrp;
 {
-	register fd;
+	int fd;
 	int ret;
 
 	DEBUG((9,"in open_bind, qlen=%d clen=%d conp=%d",qlen,clen,conp));
@@ -662,15 +678,15 @@ char **adrp;
 
 int
 bind(fd, name, qlen, clen, ap)
-register fd;
+int fd;
 char *name;
 int qlen;
-register int clen;
+int clen;
 char **ap;
 {
-	register struct t_bind *req = (struct t_bind *)0;
-	register struct t_bind *ret = (struct t_bind *)0;
-	register char	*p, *q;
+	struct t_bind *req = (struct t_bind *)0;
+	struct t_bind *ret = (struct t_bind *)0;
+	char	*p, *q;
 	unsigned int	retval;
 	extern void	nlsaddr2c();
 	extern int	memcmp();
@@ -811,7 +827,8 @@ sigset_t Oset;
 struct sigaction Sigterm;
 struct sigaction Sigcld;
 
-catch_signals()
+static void
+catch_signals(void)
 {
 	sigset_t sset;
 	sigset_t eset;
@@ -840,7 +857,8 @@ catch_signals()
  *		reset all signals to original setting.
  */
 
-rst_signals()
+static void
+rst_signals(void)
 {
 	struct sigaction sigact;
 
@@ -870,11 +888,12 @@ sigterm()
 
 static char *dbfnewdmsg = "Using new data base file";
 
-listen()
+static void
+listen(void)
 {
-	register	i;
-	register	dbf_t	*dbp	= Dbfhead;
-	register	struct	pollfd	*sp;
+	int	i;
+	dbf_t	*dbp	= Dbfhead;
+	struct	pollfd	*sp;
 	struct		call_list *phead; /* pending head */
 
 	DEBUG((9,"in listen, tag %s", Pmmsg.pm_tag));
@@ -1046,13 +1065,12 @@ check_sac_mesg()
  * doevent:	handle an asynchronous event
  */
 
-doevent(phead, fd)
-struct call_list *phead;
-int fd;
+static void
+doevent(struct call_list *phead, int fd)
 {
 	static struct t_discon *disc;
-	register struct callsave *current;
-	register struct t_call *call;
+	struct callsave *current;
+	struct t_call *call;
 	char scratch[BUFSIZ];
 
 	DEBUG((9, "in doevent"));
@@ -1107,12 +1125,11 @@ int fd;
  *		called when we are in state PM_DISABLED
  */
 
-send_dis(phead, fd)
-struct call_list *phead;
-int	fd;
+static void
+send_dis(struct call_list *phead, int fd)
 {
-	register struct t_call *call;
-	register struct callsave *current;
+	struct t_call *call;
+	struct callsave *current;
 	char	scratch[BUFSIZ];
 
 	DEBUG((9, "sending disconnect"));
@@ -1141,12 +1158,11 @@ int	fd;
  * trycon:	try to accept a connection
  */
 
-trycon(phead, fd)
-struct call_list *phead;
-int fd;
+static void
+trycon(struct call_list *phead, int fd)
 {
-	register struct callsave *current;
-	register struct t_call *call;
+	struct callsave *current;
+	struct t_call *call;
 	int i;
 	pid_t pid;
 	dbf_t *dbp;
@@ -1300,15 +1316,16 @@ cleanup:
 static char homeenv[BUFSIZ];
 static char pathenv[BUFSIZ];
 
+int
 start_server(netfd, dbp)
 int netfd;
-register dbf_t *dbp;
+dbf_t *dbp;
 {
 	char	*path;
 	char	**argvp;
 	extern	char **environ;
 	extern	char **mkdbfargv();
-	register struct passwd *pwdp;
+	struct passwd *pwdp;
 	struct	group *grpp;
 	char	msgbuf[256];
 	int	i;
@@ -1472,9 +1489,9 @@ static char prefenv[2*PATHSIZE];
 
 int
 senviron(call)
-register struct t_call *call;
+struct t_call *call;
 {
-	register char *p;
+	char *p;
 	extern void nlsaddr2c();
 	extern char *getenv();
 
@@ -1543,8 +1560,8 @@ char *
 parse(s)
 char *s;
 {
-	register char *p;
-	register char *tp;
+	char *p;
+	char *tp;
 	char scratch[BUFSIZ];
 	int delim;
 
@@ -1585,8 +1602,8 @@ char *s;
  * clr_call:	clear out a call structure
  */
 
-clr_call(call)
-struct t_call *call;
+static void
+clr_call(struct t_call *call)
 {
 	call->sequence = 0;
 	call->addr.len = 0;
@@ -1602,11 +1619,10 @@ struct t_call *call;
  * pitchcall: remove call from pending list
  */
 
-pitchcall(pending, discon)
-struct call_list *pending;
-struct t_discon *discon;
+static void
+pitchcall(struct call_list *pending, struct t_discon *discon)
 {
-	register struct callsave *p, *oldp;
+	struct callsave *p, *oldp;
 
 	DEBUG((9, "pitching call, sequence # is %d", discon->sequence));
 	if (EMPTYLIST(pending)) {
@@ -1652,13 +1668,14 @@ struct t_discon *discon;
  *	shouldn't ever change enough for this to matter.
  */
 
+int
 add_prvaddr(dbp)
 dbf_t *dbp;
 {
 	extern	char	*t_alloc();
-	register int	j;
+	int	j;
 	struct	call_list *temp_pend;
-	register struct	callsave *tmp;
+	struct	callsave *tmp;
 	char	scratch[BUFSIZ];
 	int	bindfd;
 	extern	struct	netbuf *stoa();
@@ -1740,7 +1757,8 @@ dbf_t *dbp;
  * mod_prvaddr -- after re-reading the database, take appropriate action for
  *		  new, deleted, or changed addresses.
  */
-mod_prvaddr()
+static void
+mod_prvaddr(void)
 {
 	dbf_t	*entry_p;
 	dbf_t	*oldentry_p;
@@ -1849,6 +1867,7 @@ mod_prvaddr()
  * unbind the address, close the file descriptor, and free call structs
  */
 
+int
 del_prvaddr(dbp)
 dbf_t	*dbp;
 {
@@ -1917,7 +1936,7 @@ char	*new_code;
 
 void
 rpc_register(dbp)
-register dbf_t *dbp;
+dbf_t *dbp;
 {
 	char	str[NAMEBUFSZ];
 	char	scratch[BUFSIZ];
@@ -1958,7 +1977,7 @@ register dbf_t *dbp;
 
 void
 rpc_unregister(dbp)
-register dbf_t *dbp;
+dbf_t *dbp;
 {
 	DEBUG((9, "in rpc_unregister"));
 	if (dbp->dbf_prognum == -1 || dbp->dbf_version == -1)
diff --git a/usr/src/cmd/listen/lsdbf.c b/usr/src/cmd/listen/lsdbf.c
index db52a78632..56efe2ec6c 100644
--- a/usr/src/cmd/listen/lsdbf.c
+++ b/usr/src/cmd/listen/lsdbf.c
@@ -19,11 +19,17 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * 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  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.8.5.1	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * data base routines for the network listener process
@@ -82,6 +88,7 @@ extern char  *New_cmd_lines; /* svc_code, cmd_line, mod_list (on reread)*/
  * data base file after the listener's initialization.
  */
 
+int
 read_dbf(re_read)
 int	re_read;	/* zero means first time	*/
 {
@@ -182,6 +189,7 @@ int	re_read;	/* zero means first time	*/
  *	    checking for duplicate entries as we go
  */
 
+int
 get_dbf(dbf_p, cmd_p)
 register dbf_t *dbf_p;
 register char *cmd_p;
@@ -708,7 +716,8 @@ int mflag;
 
 #define VERSIONSTR	"# VERSION="
 
-check_version()
+int
+check_version(void)
 {
 	FILE *fp;
 	char *line, *p, *tmp;
diff --git a/usr/src/cmd/listen/lslog.c b/usr/src/cmd/listen/lslog.c
index 4e32765a88..587bfe81c0 100644
--- a/usr/src/cmd/listen/lslog.c
+++ b/usr/src/cmd/listen/lslog.c
@@ -19,14 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  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"
 
 /*
@@ -67,6 +68,8 @@ extern FILE *Debugfp;
 extern char Mytag[];
 
 static char *stamp(char *);
+void logmessage(char *s);
+void clean_up(int code, int flag, char *msg);
 
 /*
  * error handling and debug routines
@@ -81,8 +84,8 @@ static char *stamp(char *);
  * error: catastrophic error handler
  */
 
-error(code, exitflag)
-int code, exitflag;
+void
+error(int code, int exitflag)
 {
 	char scratch[BUFSIZ];
 
@@ -141,13 +144,12 @@ sys_error(int code, int exitflag)
  *		is exiting due to an error. (Inherrently machine dependent.)
  */
 
-clean_up(code, flag, msg)
-register code, flag;
-char *msg;
+void
+clean_up(int code, int flag, char *msg)
 {
 	extern int Dbf_entries;
 	extern void logexit();
-	extern NLPS_proc, Nflag;
+	extern int NLPS_proc, Nflag;
 	int i;
 	extern dbf_t Dbfhead;
 	dbf_t	*dbp = &Dbfhead;
@@ -221,8 +223,8 @@ debug(int level, char *format, ...)
  * logmessage:	given a string, write a message to the logfile
  */
 
-log(code)
-int code;
+void
+log(int code)
 {
 	logmessage(err_list[code].err_msg);
 }
@@ -230,13 +232,13 @@ int code;
 
 static int nlogs;		/* maintains size of logfile	*/
 
-logmessage(s)
-char *s;
+void
+logmessage(char *s)
 {
 	char log[BUFSIZ];
 	char olog[BUFSIZ];
-	register err = 0;
-	register FILE *nlogfp;
+	int err = 0;
+	FILE *nlogfp;
 	extern int Logmax;
 	extern int Splflag;
 
diff --git a/usr/src/cmd/listen/lssmb.c b/usr/src/cmd/listen/lssmb.c
index 63b4edd8d2..efb68f5d86 100644
--- a/usr/src/cmd/listen/lssmb.c
+++ b/usr/src/cmd/listen/lssmb.c
@@ -19,11 +19,17 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * 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  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.7	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * lssmb.c:	Contains all code specific to the  MS-NET file server.
@@ -54,6 +60,7 @@
 
 extern char *malloc();
 char	*bytes_to_ascii();
+void	getword(char *addr, short *w);
 
 /*
  * In the event of an error, it may be necessary to send a response to
@@ -88,17 +95,18 @@ static unsigned char errbuf[] = {
  * Protocol...the functions gets called after the listener forks.
  */
 
+void
 smbservice(bp, bufsize, argv)
-register char *bp;	/* pointer to message buffer */
+char *bp;		/* pointer to message buffer */
 int bufsize;		/* size of message */
 char **argv;		/* server arguments */
 {
 	char *server = *argv;	/* path of server 		*/
 	char logbuf[256];
-	register char **args;
-	register int i, m_size;
-	register int twos, nulls;
-	register char *p, *q;
+	char **args;
+	int i, m_size;
+	int twos, nulls;
+	char *p, *q;
 	short size;
 
 	/*
@@ -236,11 +244,10 @@ char **argv;		/* server arguments */
 	args[i] = NULL;
 
 	exec_cmd((dbf_t *)0, args);
-	return(-1);			/* error logged in start_server */
+	return;			/* error logged in start_server */
 
 badexit:
 	logmessage(logbuf);
-	return(-1);
 }
 
 
@@ -252,9 +259,8 @@ badexit:
  * (NOTE that word is a 16-bit iapx-286 word).
  */
 
-getword(addr, w)
-register char *addr;
-short *w;
+void
+getword(char *addr, short *w)
 {
 	lobyte(*w) = *addr++;
 	hibyte(*w) = *addr;
@@ -300,14 +306,13 @@ int n;			/* size of input buffer */
 
 #else
 
-
+void
 smbservice(bp, size, argv)
 char *bp;		/* pointer to message buffer */
 int size;		/* size of message */
 char **argv;		/* server arguments */
 {
 	logmessage("SMB service NOT supported");
-	return(-1);
 }
 
 #endif	/* SMBSERVICE */
diff --git a/usr/src/cmd/listen/nlps_serv.c b/usr/src/cmd/listen/nlps_serv.c
index 79fbf15cf2..9c07056739 100644
--- a/usr/src/cmd/listen/nlps_serv.c
+++ b/usr/src/cmd/listen/nlps_serv.c
@@ -19,17 +19,16 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
-#ident	"%Z%%M%	%I%	%E% SMI"
-		/* SVr4.0 1.3.4.1	*/
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /* system include files	*/
 
@@ -97,10 +96,11 @@ char	Altbasedir[BUFSIZ];
 char	Basedir[BUFSIZ];
 extern	char *getenv();
 
-main (path, argv, environ)
-char *path;
-char **argv;
-char **environ;
+static void nls_reply(int code, char *text);
+static void nullfix(void);
+
+int
+main(int argc, char **argv)
 {
 	extern int read_dbf();
 	char *provider;
@@ -139,13 +139,14 @@ char **environ;
  *  nlps_server: 
  */
 
+int
 nlps_server()
 {
-	register size;
+	int size;
 	char buf[RCVBUFSZ];
 	char **argv;
-	register char *bp = buf;
-	register dbf_t *dbp;
+	char *bp = buf;
+	dbf_t *dbp;
 	dbf_t *getdbfentry();
 	extern char **mkdbfargv();
 
@@ -218,10 +219,10 @@ nlps_server()
 
 int
 getrequest(bp)
-register char *bp;
+char *bp;
 {
-	register size;
-	register char *tmp = bp;
+	int size;
+	char *tmp = bp;
 	int flags;
 	extern void timeout();
 	short cnt;
@@ -338,7 +339,8 @@ register char *bp;
  * in the log file.
  */
 
-nullfix()
+static void
+nullfix(void)
 {
 	struct strpeek peek;
 	register struct strpeek *peekp;
@@ -558,6 +560,7 @@ char *bp;
  *			 FALSE== bad format
  */
 
+int
 nls_chkmsg(bp, size, lowp, highp, svc_code_p)
 char *bp, *svc_code_p;
 int size, *lowp, *highp;
@@ -586,9 +589,8 @@ int size, *lowp, *highp;
 
 static char *srrpprot = "%d:%d:%s";
 
-nls_reply(code, text)
-register code;
-register char *text;
+static void
+nls_reply(int code, char *text)
 {
 	char scratch[256];
 
@@ -614,18 +616,17 @@ static char homeenv[BUFSIZ];
 #define NETFD	0
 
 
-exec_cmd(dbp, o_argv)
-register dbf_t *dbp;
-register char **o_argv;
+int
+exec_cmd(dbf_t *dbp, char **o_argv)
 {
 	char *path;
 	char **argvp;
 	extern char **environ;
 	dbf_t *getdbfentry();
 	extern char **mkdbfargv();
-	register struct passwd *pwdp;
+	struct passwd *pwdp;
 	struct group *grpp;
-	register dbf_t *wdbp = dbp;
+	dbf_t *wdbp = dbp;
 	int	i;
 
 	/*
diff --git a/usr/src/cmd/listen/nlsaddr.c b/usr/src/cmd/listen/nlsaddr.c
index 6af094541f..727ceb6518 100644
--- a/usr/src/cmd/listen/nlsaddr.c
+++ b/usr/src/cmd/listen/nlsaddr.c
@@ -19,11 +19,17 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * 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  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.3	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * nlsaddr.c:
@@ -167,8 +173,8 @@ static char hex_digits[] = "0123456789ABCDEF";
 
 void
 nlsaddr2c(charaddr, addr, len)
-register char *charaddr, *addr;
-register len;
+char *charaddr, *addr;
+int len;
 {
 	register unsigned i;
 
@@ -204,13 +210,13 @@ register len;
 
 int
 nlsc2addr(addr, maxlen, charaddr)
-register char *addr, *charaddr;
-register maxlen;
+char *addr, *charaddr;
+int maxlen;
 {
-	register len;
-	register int i;
-	register char c;
-	register unsigned char val;
+	int len;
+	int i;
+	char c;
+	unsigned char val;
 
 	if (strlen(charaddr) & 1)
 		return(-1);
diff --git a/usr/src/cmd/listen/nstoa.c b/usr/src/cmd/listen/nstoa.c
index 60e50668ac..39a031d49a 100644
--- a/usr/src/cmd/listen/nstoa.c
+++ b/usr/src/cmd/listen/nstoa.c
@@ -19,11 +19,17 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * 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  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.2	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
 	stoa - convert string to address
@@ -494,6 +500,7 @@ char	*s;
 	Return 0 if anything failed, else 1.
 */
 
+int
 scan(s)
 char	*s;
 {
diff --git a/usr/src/cmd/soelim/soelim.c b/usr/src/cmd/soelim/soelim.c
index 81c9684da5..02acc14a4b 100644
--- a/usr/src/cmd/soelim/soelim.c
+++ b/usr/src/cmd/soelim/soelim.c
@@ -1,3 +1,8 @@
+/*
+ * 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  	*/
 
@@ -7,13 +12,8 @@
  * All rights reserved. The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  */
-     
-/*
- * Copyright (c) 1983, 1984 1985, 1986, 1987, 1988, Sun Microsystems, Inc.
- * All Rights Reserved.
- */
-  
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.1	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
 /*
@@ -34,9 +34,8 @@
  */
 #define	STDIN_NAME	"-"
 
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 
 	argc--;
@@ -50,7 +49,7 @@ main(argc, argv)
 		argv++;
 		argc--;
 	} while (argc > 0);
-	exit(0);
+	return (0);
 }
 
 int process(file)