6271033 gcc and cmd/dminfo don't get along

6272051 gcc and cmd/nlsadmin don't get along
6273848 gcc and cmd/setfacl don't get along
6274778 gcc and ucbcmd/sed don't get along

6 files changed, 165 insertions, 149 deletions

diff --git a/usr/src/cmd/dminfo/dminfo.c b/usr/src/cmd/dminfo/dminfo.c
index a70c0e2706..b1dc7ea49f 100644
--- a/usr/src/cmd/dminfo/dminfo.c
+++ b/usr/src/cmd/dminfo/dminfo.c
@@ -19,15 +19,15 @@
  *
  * 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.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #if !defined(lint) && defined(SCCSIDS)
-/* from UCB 4.18 84/02/02 */
-static char	*bsm_sccsid = "%Z%%M%	%I%	%E% SMI; SunOS BSM";
+static char	*bsm_sccsid =
+		    "@(#)dminfo.c	1.8	05/06/15 SMI; SunOS BSM";
 #endif
 
 #include <locale.h>
@@ -49,7 +49,7 @@ static char	*bsm_sccsid = "%Z%%M%	%I%	%E% SMI; SunOS BSM";
 #define	EFAIL 1
 
 #if !defined(TEXT_DOMAIN)
-#define TEXT_DOMAIN "SUNW_BSM_DMINFO"
+#define	TEXT_DOMAIN "SUNW_BSM_DMINFO"
 #endif
 
 extern off_t lseek();
@@ -76,10 +76,9 @@ printdmapent(dmapp)
 
 
 /*
- * dmapi_err(exit_code,err_msg) prints message pointed to by err_msg to s
-tderr.
- * Then prints usage message to stderr. Then exits program with exit_code
-.
+ * dmapi_err(exit_code,err_msg) prints message pointed to by err_msg to
+ * stderr. Then prints usage message to stderr. Then exits program with
+ * exit_code.
  *
  */
 static void
@@ -112,9 +111,8 @@ char	*err_msg;
 }
 
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
 	devmap_t *dmapp;
 	devmap_t dmap;
@@ -229,12 +227,12 @@ char	*argv[];
 			dmapi_err(EINVOKE,
 				gettext("Bad dmap_devname in entry argument"));
 		}
-		if ((dmap.dmap_devtype = getdmapfield((char *) NULL)) ==
+		if ((dmap.dmap_devtype = getdmapfield((char *)NULL)) ==
 			NULL) {
 			dmapi_err(EINVOKE,
 				gettext("Bad dmap_devtype in entry Argument"));
 		}
-		if ((dmap.dmap_devlist = getdmapfield((char *) NULL)) ==
+		if ((dmap.dmap_devlist = getdmapfield((char *)NULL)) ==
 			NULL) {
 			dmapi_err(EINVOKE,
 				gettext("Bad dmap_devlist in entry argument"));
@@ -245,7 +243,7 @@ char	*argv[];
 		 * want to corrupt the existing string.
 		 */
 		cntr = strlen(dmap.dmap_devlist) + 1;
-		mptr = calloc((unsigned) cntr, sizeof (char));
+		mptr = calloc((unsigned)cntr, sizeof (char));
 		if (mptr == NULL) {
 			if (verbose) {
 				(void) fprintf(stderr,
@@ -264,7 +262,8 @@ char	*argv[];
 		if ((des = open(filename, O_RDWR)) < 0) {
 			if (verbose) {
 				(void) fprintf(stderr,
-				gettext("dmapinfo: Cannot open %s\n"), filename);
+				gettext("dmapinfo: Cannot open %s\n"),
+				    filename);
 			}
 			exit(1);
 		}
@@ -334,7 +333,7 @@ char	*argv[];
 (void) fprintf(stderr, gettext("dmapinfo: Device (%s) not found in %s.\n"),
 					nptr, filename);
 			}
-			nptr = getdmapdfield((char *) NULL);
+			nptr = getdmapdfield((char *)NULL);
 		}
 		/*
 		 * Good the entry is uniq. So lets find out how long it is
@@ -350,7 +349,7 @@ char	*argv[];
 		cntr += strlen(dmap.dmap_devtype);
 		cntr += strlen(dmap.dmap_devlist);
 		cntr += 15;
-		tptr = calloc((unsigned) cntr, sizeof (char));
+		tptr = calloc((unsigned)cntr, sizeof (char));
 		if (tptr == NULL) {
 			exit(1);
 		}
@@ -476,5 +475,5 @@ char	*argv[];
 	enddmapent();
 	if (cntr == 0)
 		exit(1);
-	exit(0);
+	return (0);
 }
diff --git a/usr/src/cmd/nlsadmin/nlsadmin.c b/usr/src/cmd/nlsadmin/nlsadmin.c
index 5ace867cc1..15973483a1 100644
--- a/usr/src/cmd/nlsadmin/nlsadmin.c
+++ b/usr/src/cmd/nlsadmin/nlsadmin.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -54,6 +54,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
@@ -109,10 +110,11 @@ struct	svcfields {
 	char	*comment;
 };
 
+void no_permission(void) __NORETURN;
+void usage(int flag);
 
-main(argc, argv)
-int argc;
-char **argv;
+int
+main(int argc, char **argv)
 {
 	extern	char *optarg;
 	extern	int optind;
@@ -316,6 +318,7 @@ char **argv;
 		case '?':
 			usage(USAGE);
 		}
+		/* NOTREACHED */	
 	}
 
 	if ((optind < argc) && ! netspec)
@@ -461,7 +464,7 @@ char **argv;
 	}
 	if (exitcode == NLS_SYSERR)
 		nlsmesg(MM_ERROR, "System error in SAC command");
-	exit(exitcode);
+	return (exitcode);
 }
 
 
@@ -479,8 +482,8 @@ static char umsg[] = "usage: %s -x\n\
        [[-l addr | -] [-t addr | -]] |\n\
 ";
 
-usage(flag)
-int	flag;
+void
+usage(int flag)
 {
 	switch (flag) {
 	case INCONSISTENT:
@@ -502,7 +505,8 @@ int	flag;
  *                 needs to be root and isn't.
  */
 
-no_permission()
+void
+no_permission(void)
 {
 	nlsmesg(MM_ERROR, "Must be super user");
 	exit(NLS_PERM);
@@ -515,9 +519,7 @@ no_permission()
  */
 
 void
-nlsmesg(severity, text)
-int	severity;
-char	*text;
+nlsmesg(int severity, char *text)
 {
 	int	class;
 
@@ -532,15 +534,16 @@ char	*text;
  * prt_cmd:  print out the listener-dependent string for sacadm.
  */
 
-prt_cmd(path, flags, modules, addr, rpcp)
-char	*path;		/* full path of command or pipe */
-long	flags;		/* listener flags		*/
-			/* PFLAG for pipe		*/
-			/* CFLAG for command		*/
-			/* DFLAG for dynamic addr	*/
-char	*modules; 	/* STREAMS modules to push	*/
-char	*addr;		/* private address		*/
-char	*rpcp;		/* RPC prog and ver #		*/
+int
+prt_cmd(char *path, long flags, char *modules, char *addr, char *rpcp)
+	/* path: full path of command or pipe	*/
+	/* flags: listener flags		*/
+	/* PFLAG for pipe			*/
+	/* CFLAG for command			*/
+	/* DFLAG for dynamic addr		*/
+ 	/* modules: STREAMS modules to push	*/
+	/* addr: private address		*/
+	/* rpcp: RPC prog and ver #		*/
 {
 	struct	stat	sbuf;
 	char	mesgbuf[BUFSIZ];
@@ -576,15 +579,9 @@ char	*rpcp;		/* RPC prog and ver #		*/
  *              not allow specification of a private address -- use pmadm!
  */
 
-old_addsvc(svc, addr, cmd, com, module, id, flags, netspec)
-char	*svc;
-char	*addr;
-char	*cmd;
-char	*com;
-char	*module;
-char	*id;
-char	*flags;
-char	*netspec;
+int
+old_addsvc(char *svc, char *addr, char *cmd, char *com, char *module,
+    char *id, char *flags, char *netspec)
 {
 	char	buf[BUFSIZ];
 	char	mesgbuf[BUFSIZ];
@@ -654,14 +651,15 @@ char	*netspec;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 /*
  * prt_nets:  print the status of one network, or all nets if netspec 
  *            is NULL
  */
-prt_nets(netspec)
-char	*netspec;
+int
+prt_nets(char *netspec)
 {
 	char	buf[BUFSIZ];
 	FILE	*fp;
@@ -727,9 +725,8 @@ char	*netspec;
  * if svc is NULL
  */
 
-prt_svcs(svc, netspec)
-char	*svc;
-char	*netspec;
+int
+prt_svcs(char *svc, char *netspec)
 {
 	char	buf[BUFSIZ];
 	char	mesg[BUFSIZ];
@@ -815,9 +812,8 @@ char	*netspec;
  * disable_svc:  use pmadm to disable a service 
  */
 
-disable_svc(svc, netspec)
-char	*svc;
-char	*netspec;
+int
+disable_svc(char *svc, char *netspec)
 {
 	char	buf[BUFSIZ];
 	int	rtn;
@@ -852,12 +848,12 @@ char	*netspec;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 
-enable_svc(svc, netspec)
-char	*svc;
-char	*netspec;
+int
+enable_svc(char *svc, char *netspec)
 {
 	char	buf[BUFSIZ];
 	int	rtn;
@@ -892,13 +888,12 @@ char	*netspec;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 
-remove_svc(svc, netspec, printerrors)
-char	*svc;
-char	*netspec;
-int	printerrors;
+int
+remove_svc(char *svc, char *netspec, int printerrors)
 {
 	char	buf[BUFSIZ];
 	int	rtn;
@@ -934,11 +929,12 @@ int	printerrors;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 
-kill_listener(netspec)
-char	*netspec;
+int
+kill_listener(char *netspec)
 {
 	char	buf[BUFSIZ];
 	char	mesg[BUFSIZ];
@@ -977,6 +973,7 @@ char	*netspec;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 
@@ -984,8 +981,8 @@ char	*netspec;
  * add_pm:  add a port monitor (initialize directories) using sacadm
  */
 
-add_pm(netspec)
-char	*netspec;
+int
+add_pm(char *netspec)
 {
 	char	buf[BUFSIZ];
 	char	mesg[BUFSIZ];
@@ -1022,6 +1019,7 @@ char	*netspec;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 
@@ -1031,8 +1029,7 @@ char	*netspec;
  */
 
 char *
-gencmdstr(netspec)
-char *netspec;
+gencmdstr(char *netspec)
 {
 	static char buf[BUFSIZ];
 
@@ -1049,8 +1046,8 @@ char *netspec;
  * start_listener: start the listener
  */
 
-start_listener(netspec)
-char	*netspec;
+int
+start_listener(char *netspec)
 {
 	char	buf[BUFSIZ];
 	char	scratch[BUFSIZ];
@@ -1119,6 +1116,7 @@ char	*netspec;
 		no_permission();
 		break;
 	}
+	/* NOTREACHED */
 }
 
 
@@ -1126,10 +1124,8 @@ char	*netspec;
  * setup_addr:  setup the -l and -t addresses.
  */
 
-setup_addr(laddr, taddr, netspec)
-char	*laddr;
-char	*taddr;
-char	*netspec;
+int
+setup_addr(char *laddr, char *taddr, char *netspec)
 {
 	char	buf[BUFSIZ];
 	char	mesg[BUFSIZ];
@@ -1243,9 +1239,8 @@ char	*netspec;
  *                             into the structure.
  */
 
-svc_format(buf, entry)
-char	*buf;
-struct	svcfields *entry;
+int
+svc_format(char *buf, struct svcfields *entry)
 {
 	char	*ptr;		/* temporary pointer into buffer	*/
 	char	*tmp;		/* temporary pointer into buffer	*/
@@ -1327,9 +1322,7 @@ struct	svcfields *entry;
 
 
 char *
-nexttok(str, delim)
-char *str;
-register char *delim;
+nexttok(char *str, char *delim)
 {
 	static char *savep;	/* the remembered string */
 	register char *p;	/* pointer to start of token */
@@ -1356,8 +1349,7 @@ register char *delim;
  */
 
 char *
-pflags(flags)
-long flags;
+pflags(long flags)
 {
 	register int i;			/* scratch counter */
 	static char buf[BUFSIZ];	/* formatted flags */
diff --git a/usr/src/cmd/setfacl/setfacl.c b/usr/src/cmd/setfacl/setfacl.c
index f76a4e68bb..0f97da84c3 100644
--- a/usr/src/cmd/setfacl/setfacl.c
+++ b/usr/src/cmd/setfacl/setfacl.c
@@ -19,17 +19,18 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #ifndef lint
-static char sccsid[] = "%Z%%M%	%I%	%E% SMI";
+static char sccsid[] = "@(#)setfacl.c	1.10	05/06/16 SMI";
 #endif
 
 /*
- * Copyright (c) 1993, by Sun Microsystems, Inc.
- */
-
-/*
  * setfacl [-r] -f aclfile file ...
  * setfacl [-r] -d acl_entries file ...
  * setfacl [-r] -m acl_entries file ...
@@ -65,6 +66,7 @@ static int parse_entry(char *, aclent_t *, int);
 static void err_handle(int, aclent_t *);
 static int conv_id(char *);
 
+int
 main(int argc, char *argv[])
 {
 	int		c;
@@ -188,7 +190,7 @@ main(int argc, char *argv[])
 				exit(2);
 		}
 	}
-	exit(0);
+	return (0);
 }
 
 /*
@@ -389,6 +391,7 @@ parse_entry_list(aclent_t **aclpp, int *aclcntp, char *listp, int mode)
 		if (convert_to_aclent_t(listp, aclcntp, aclpp, mode) == -1)
 			return (-1);
 	}
+	return (0);
 }
 
 /*
diff --git a/usr/src/ucbcmd/sed/sed.h b/usr/src/ucbcmd/sed/sed.h
index 92ac2c0cd7..f814ce4ef6 100644
--- a/usr/src/ucbcmd/sed/sed.h
+++ b/usr/src/ucbcmd/sed/sed.h
@@ -20,14 +20,17 @@
  * 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.
  */
 
 /*	Copyright (c) 1984 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* from S5R3.1 1.8	*/
+#ifndef	_SED_H
+#define	_SED_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * sed -- stream  editor
@@ -150,3 +153,7 @@ char    *compsub();
 struct label    *search();
 char    *gline();
 char    *place();
+void comperr(char *);
+void execute(char *);
+
+#endif	/* _SED_H */
diff --git a/usr/src/ucbcmd/sed/sed0.c b/usr/src/ucbcmd/sed/sed0.c
index e8d46ea2c5..2a1749f757 100644
--- a/usr/src/ucbcmd/sed/sed0.c
+++ b/usr/src/ucbcmd/sed/sed0.c
@@ -19,20 +19,21 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-/*
- * Copyright (c) 1996, by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from S5R3.1 1.10 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
 #include <sys/param.h>
 #include "sed.h"
+
 #define	NWFILES		11	/* 10 plus one for standard output */
 FILE	*fin;
 FILE    *fcode[NWFILES];
@@ -40,7 +41,7 @@ char    *lastre;
 char    sseof;
 union reptr     *ptrend;
 int     eflag;
-extern     nbra;
+extern	int	nbra;
 char    linebuf[LBSIZE+1];
 int     gflag;
 int     nlno;
@@ -70,13 +71,16 @@ char    AD0MES[]	= "No addresses allowed: %s";
 char    AD1MES[]	= "Only one address allowed: %s";
 char	TOOBIG[]	= "Suffix too large - 512 max: %s";
 
-extern	sed;	  /* IMPORTANT flag !!! */
+extern int sed;	  /* IMPORTANT flag !!! */
 extern char *comple();
 
 extern char *malloc();
 
-main(argc, argv)
-char    *argv[];
+static void dechain(void);
+static void fcomp(void);
+
+int
+main(int argc, char *argv[])
 {
 	int flag_found = 0;
 
@@ -167,14 +171,14 @@ char    *argv[];
 		execute(*eargv++);
 	}
 	(void) fclose(stdout);
-	exit(0);
-	/*NOTREACHED*/
+	return (0);
 }
 
-fcomp()
+static void
+fcomp(void)
 {
 
-	register char   *p, *op, *tp;
+	char   *p, *op, *tp;
 	char    *address();
 	union reptr     *pt, *pt1;
 	int     i, ii;
@@ -199,7 +203,7 @@ fcomp()
 		cp = linebuf;
 
 comploop:
-/*      (void) fprintf(stderr, "cp: %s\n", cp);	/*DEBUG*/
+/*		(void) fprintf(stderr, "cp: %s\n", cp); DEBUG */
 		while(*cp == ' ' || *cp == '\t')	cp++;
 		if(*cp == '\0' || *cp == '#')	 continue;
 		if(*cp == ';') {
@@ -572,10 +576,11 @@ done:
 	rep->r1.command = 0;
 	lastre = op;
 }
+
 char    *compsub(rhsbuf)
 char    *rhsbuf;
 {
-	register char   *p, *q;
+	char   *p, *q;
 
 	p = rhsbuf;
 	q = cp;
@@ -603,12 +608,13 @@ char    *rhsbuf;
 	}
 }
 
+int
 rline(lbuf, lbend)
 char    *lbuf;
 char	*lbend;
 {
-	register char   *p, *q;
-	register	t;
+	char   *p, *q;
+	int	t;
 	static char     *saveq;
 
 	p = lbuf;
@@ -696,7 +702,7 @@ char	*lbend;
 char    *address(expbuf)
 char    *expbuf;
 {
-	register char   *rcp;
+	char   *rcp;
 	long long	lno;
 
 	if(*cp == '$') {
@@ -739,7 +745,7 @@ char    *text(textbuf, tbend)
 char    *textbuf;
 char	*tbend;
 {
-	register char   *p, *q;
+	char   *p, *q;
 
 	p = textbuf;
 	q = cp;
@@ -788,7 +794,8 @@ struct label    *ptr;
 }
 
 
-dechain()
+static void
+dechain(void)
 {
 	struct label    *lptr;
 	union reptr     *rptr, *trptr;
@@ -814,9 +821,9 @@ dechain()
 char *ycomp(expbuf)
 char    *expbuf;
 {
-	register char   c; 
-	register char *ep, *tsp;
-	register int i;
+	char	c;
+	char *ep, *tsp;
+	int i;
 	char    *sp;
 
 	ep = expbuf;
@@ -858,8 +865,9 @@ char    *expbuf;
 
 	return(ep + 0400);
 }
-comperr(msg)
-char *msg;
+
+void
+comperr(char *msg)
 {
 	(void) fprintf(stderr, "sed: ");
 	(void) fprintf(stderr, msg, linebuf);
diff --git a/usr/src/ucbcmd/sed/sed1.c b/usr/src/ucbcmd/sed/sed1.c
index 49835169dd..c5f5d89144 100644
--- a/usr/src/ucbcmd/sed/sed1.c
+++ b/usr/src/ucbcmd/sed/sed1.c
@@ -19,16 +19,16 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-/*
- * Copyright (c) 1996, by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from S5R3.1 1.7 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -95,11 +95,17 @@ char	rub[] = {"\\177"};
 
 extern char TMMES[];
 
-execute(file)
-char *file;
+static int match(char *expbuf, int gf);
+static int substitute(union reptr *ipc);
+static void dosub(char *rhsbuf, int n);
+static void command(union reptr *ipc);
+static void arout(void);
+
+void
+execute(char *file)
 {
-	register char *p1, *p2;
-	register union reptr	*ipc;
+	char *p1, *p2;
+	union reptr	*ipc;
 	int	c;
 	char	*execp;
 
@@ -218,10 +224,11 @@ char *file;
 
 	}
 }
-match(expbuf, gf)
-char	*expbuf;
+
+static int
+match(char *expbuf, int gf)
 {
-	register char   *p1;
+	char   *p1;
 
 	if(gf) {
 		if(*expbuf)	return(0);
@@ -235,8 +242,8 @@ char	*expbuf;
 	return(step(p1, expbuf));
 }
 
-substitute(ipc)
-union reptr	*ipc;
+static int
+substitute(union reptr *ipc)
 {
 	if(match(ipc->r1.re1, 0) == 0)	return(0);
 
@@ -253,11 +260,10 @@ union reptr	*ipc;
 	return(sflag);
 }
 
-dosub(rhsbuf,n)
-char	*rhsbuf;
-int	n;
+static void
+dosub(char *rhsbuf, int n)
 {
-	register char *lp, *sp, *rp;
+	char *lp, *sp, *rp;
 	int c;
 
 	if(n > 0 && n < 999)
@@ -305,7 +311,7 @@ out:
 char	*place(asp, al1, al2)
 char	*asp, *al1, *al2;
 {
-	register char *sp, *l1, *l2;
+	char *sp, *l1, *l2;
 
 	sp = asp;
 	l1 = al1;
@@ -318,11 +324,11 @@ char	*asp, *al1, *al2;
 	return(sp);
 }
 
-command(ipc)
-union reptr	*ipc;
+static void
+command(union reptr *ipc)
 {
-	register int	i;
-	register char   *p1, *p2, *p3;
+	int	i;
+	char   *p1, *p2, *p3;
 	char	*execp;
 
 
@@ -597,8 +603,8 @@ union reptr	*ipc;
 char	*gline(addr)
 char	*addr;
 {
-	register char   *p1, *p2;
-	register	c;
+	char   *p1, *p2;
+	int	c;
 	sflag = 0;
 	p1 = addr;
 	p2 = cbp;
@@ -650,9 +656,9 @@ char	*addr;
 char *comple(x1, ep, x3, x4)
 char *x1, *x3;
 char x4;
-register char *ep;
+char *ep;
 {
-	register char *p;
+	char *p;
 
 	p = compile(x1, ep + 1, x3, x4);
 	if(p == ep + 1)
@@ -661,8 +667,8 @@ register char *ep;
 	return(p);
 }
 
-regerr(err)
-register err;
+int
+regerr(int err)
 {
 	switch(err) {
 
@@ -720,11 +726,13 @@ register err;
 		exit(2);
 		break;
 	}
+	return (0);
 }
 
-arout()
+static void
+arout(void)
 {
-	register char   *p1;
+	char   *p1;
 	FILE	*fi;
 	char	c;
 	int	t;
@@ -748,4 +756,3 @@ arout()
 	aptr = abuf;
 	*aptr = 0;
 }
-