From 2b784fa564960140b91518a4b72da43b93b986c8 Mon Sep 17 00:00:00 2001
From: steve <steve@FreeBSD.org>
Date: Mon, 28 Apr 1997 03:06:52 +0000
Subject: Nuke register keyword usage and #if -> #ifdef.

Obtained from: NetBSD
---
 bin/sh/alias.c      |  4 ++--
 bin/sh/bltin/echo.c |  8 ++++----
 bin/sh/cd.c         |  4 ++--
 bin/sh/error.c      | 14 +++++++-------
 bin/sh/eval.c       |  4 ++--
 bin/sh/jobs.c       | 18 +++++++++---------
 bin/sh/mail.c       |  6 +++---
 bin/sh/memalloc.c   | 10 +++++-----
 bin/sh/miscbltin.c  |  4 ++--
 bin/sh/mkinit.c     | 24 ++++++++++++------------
 bin/sh/mystring.c   | 14 +++++++-------
 bin/sh/output.h     |  4 ++--
 bin/sh/show.c       | 10 +++++-----
 bin/sh/var.c        |  6 +++---
 14 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index ef5916e..12a0ec9 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: alias.c,v 1.7 1997/02/22 13:58:20 peter Exp $
  */
 
 #ifndef lint
@@ -251,7 +251,7 @@ unaliascmd(argc, argv)
 
 STATIC struct alias **
 hashalias(p)
-	register char *p;
+	char *p;
 	{
 	unsigned int hashval;
 
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index c2f2176..f082905 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)echo.c	8.2 (Berkeley) 5/4/95
- *	$Id$
+ *	$Id: echo.c,v 1.7 1997/02/22 13:58:59 peter Exp $
  */
 
 /*
@@ -52,9 +52,9 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register char **ap;
-	register char *p;
-	register char c;
+	char **ap;
+	char *p;
+	char c;
 	int count;
 	int nflag = 0;
 #ifndef eflag
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index dbd9dc8..e825453 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cd.c,v 1.14 1997/02/22 13:58:22 peter Exp $
  */
 
 #ifndef lint
@@ -155,7 +155,7 @@ docd(dest, print)
 STATIC char *
 getcomponent()
 {
-	register char *p;
+	char *p;
 	char *start;
 
 	if ((p = cdcomppath) == NULL)
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 1919068..b870e2e 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: error.c,v 1.8 1997/02/22 13:58:22 peter Exp $
  */
 
 #ifndef lint
@@ -145,7 +145,7 @@ exverror(cond, msg, ap)
 }
 
 
-#if __STDC__
+#ifdef __STDC__
 void
 error(char *msg, ...)
 #else
@@ -154,11 +154,11 @@ error(va_alist)
 	va_dcl
 #endif
 {
-#if !__STDC__
+#ifndef __STDC__
 	char *msg;
 #endif
 	va_list ap;
-#if __STDC__
+#ifdef __STDC__
 	va_start(ap, msg);
 #else
 	va_start(ap);
@@ -169,7 +169,7 @@ error(va_alist)
 }
 
 
-#if __STDC__
+#ifdef __STDC__
 void
 exerror(int cond, char *msg, ...)
 #else
@@ -178,12 +178,12 @@ exerror(va_alist)
 	va_dcl
 #endif
 {
-#if !__STDC__
+#ifndef __STDC__
 	int cond;
 	char *msg;
 #endif
 	va_list ap;
-#if __STDC__
+#ifdef __STDC__
 	va_start(ap, msg);
 #else
 	va_start(ap);
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 18cf76f..82f7f1f 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: eval.c,v 1.11 1997/02/22 13:58:23 peter Exp $
  */
 
 #ifndef lint
@@ -422,7 +422,7 @@ STATIC void
 expredir(n)
 	union node *n;
 {
-	register union node *redir;
+	union node *redir;
 
 	for (redir = n ; redir ; redir = redir->nfile.next) {
 		struct arglist fn;
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index cac64c4..2ba7616 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: jobs.c,v 1.12 1997/02/22 13:58:29 peter Exp $
  */
 
 #ifndef lint
@@ -56,7 +56,7 @@ static char const sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 
 #include "shell.h"
 #if JOBS
-#ifdef OLD_TTY_DRIVER
+#if OLD_TTY_DRIVER
 #include "sgtty.h"
 #else
 #include <termios.h>
@@ -440,7 +440,7 @@ getjob(name)
 	char *name;
 	{
 	int jobno;
-	register struct job *jp;
+	struct job *jp;
 	int pid;
 	int i;
 
@@ -464,7 +464,7 @@ currentjob:
 			goto currentjob;
 #endif
 		} else {
-			register struct job *found = NULL;
+			struct job *found = NULL;
 			for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
 				if (jp->used && jp->nprocs > 0
 				 && prefix(name + 1, jp->ps[0].cmd)) {
@@ -686,7 +686,7 @@ forkshell(jp, n, mode)
 
 int
 waitforjob(jp)
-	register struct job *jp;
+	struct job *jp;
 	{
 #if JOBS
 	int mypgrp = getpgrp();
@@ -907,8 +907,8 @@ int job_warning = 0;
 int
 stoppedjobs()
 {
-	register int jobno;
-	register struct job *jp;
+	int jobno;
+	struct job *jp;
 
 	if (job_warning)
 		return (0);
@@ -1080,8 +1080,8 @@ STATIC void
 cmdputs(s)
 	char *s;
 	{
-	register char *p, *q;
-	register char c;
+	char *p, *q;
+	char c;
 	int subtype = 0;
 
 	if (cmdnleft <= 0)
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 0c12232..4269d75 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mail.c,v 1.6 1997/02/22 13:58:31 peter Exp $
  */
 
 #ifndef lint
@@ -72,10 +72,10 @@ void
 chkmail(silent)
 	int silent;
 {
-	register int i;
+	int i;
 	char *mpath;
 	char *p;
-	register char *q;
+	char *q;
 	struct stackmark smark;
 	struct stat statb;
 
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index d4984a2..b69c128 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: memalloc.c,v 1.7 1997/02/22 13:58:34 peter Exp $
  */
 
 #ifndef lint
@@ -57,7 +57,7 @@ pointer
 ckmalloc(nbytes)
 	int nbytes;
 {
-	register pointer p;
+	pointer p;
 
 	if ((p = malloc(nbytes)) == NULL)
 		error("Out of space");
@@ -71,7 +71,7 @@ ckmalloc(nbytes)
 
 pointer
 ckrealloc(p, nbytes)
-	register pointer p;
+	pointer p;
 	int nbytes;
 {
 
@@ -89,7 +89,7 @@ char *
 savestr(s)
 	char *s;
 	{
-	register char *p;
+	char *p;
 
 	p = ckmalloc(strlen(s) + 1);
 	scopy(s, p);
@@ -127,7 +127,7 @@ pointer
 stalloc(nbytes)
 	int nbytes;
 {
-	register char *p;
+	char *p;
 
 	nbytes = ALIGN(nbytes);
 	if (nbytes > stacknleft) {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 31efbfe..2635f0b 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: miscbltin.c,v 1.11 1997/02/22 13:58:35 peter Exp $
  */
 
 #ifndef lint
@@ -292,7 +292,7 @@ ulimitcmd(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int	c;
+	int	c;
 	quad_t val = 0;
 	enum { SOFT = 0x1, HARD = 0x2 }
 			how = SOFT | HARD;
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 5e4efdf..1a5020f 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mkinit.c,v 1.9 1997/02/22 13:58:36 peter Exp $
  */
 
 #ifndef lint
@@ -237,7 +237,7 @@ match(name, line)
 	char *name;
 	char *line;
 {
-	register char *p, *q;
+	char *p, *q;
 
 	p = name, q = line;
 	while (*p) {
@@ -254,7 +254,7 @@ int
 gooddefine(line)
 	char *line;
 {
-	register char *p;
+	char *p;
 
 	if (! match("#define", line))
 		return 0;			/* not a define */
@@ -276,7 +276,7 @@ gooddefine(line)
 
 void
 doevent(ep, fp, fname)
-	register struct event *ep;
+	struct event *ep;
 	FILE *fp;
 	char *fname;
 	{
@@ -318,9 +318,9 @@ void
 doinclude(line)
 	char *line;
 	{
-	register char *p;
+	char *p;
 	char *name;
-	register char **pp;
+	char **pp;
 
 	for (p = line ; *p != '"' && *p != '<' && *p != '\0' ; p++);
 	if (*p == '\0')
@@ -345,7 +345,7 @@ dodecl(line1, fp)
 	FILE *fp;
 	{
 	char line[1024];
-	register char *p, *q;
+	char *p, *q;
 
 	if (strcmp(line1, "MKINIT\n") == 0) { /* start of struct/union decl */
 		addchar('\n', &decls);
@@ -419,8 +419,8 @@ output() {
 
 void
 addstr(s, text)
-	register char *s;
-	register struct text *text;
+	char *s;
+	struct text *text;
 	{
 	while (*s) {
 		if (--text->nleft < 0)
@@ -434,7 +434,7 @@ addstr(s, text)
 void
 addchar(c, text)
 	int c;
-	register struct text *text;
+	struct text *text;
 {
 	struct block *bp;
 
@@ -486,7 +486,7 @@ void *
 ckmalloc(nbytes)
 	int nbytes;
 {
-	register char *p;
+	char *p;
 
 	if ((p = malloc(nbytes)) == NULL)
 		error("Out of space");
@@ -497,7 +497,7 @@ char *
 savestr(s)
 	char *s;
 	{
-	register char *p;
+	char *p;
 
 	p = ckmalloc(strlen(s) + 1);
 	strcpy(p, s);
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 20b0343..af34635 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mystring.c,v 1.7 1997/02/22 13:58:38 peter Exp $
  */
 
 #ifndef lint
@@ -76,9 +76,9 @@ char nullstr[1];		/* zero length string */
 
 void
 scopyn(from, to, size)
-	register char const *from;
-	register char *to;
-	register int size;
+	char const *from;
+	char *to;
+	int size;
 	{
 
 	while (--size > 0) {
@@ -95,8 +95,8 @@ scopyn(from, to, size)
 
 int
 prefix(pfx, string)
-	register char const *pfx;
-	register char const *string;
+	char const *pfx;
+	char const *string;
 	{
 	while (*pfx) {
 		if (*pfx++ != *string++)
@@ -129,7 +129,7 @@ number(s)
 
 int
 is_number(p)
-	register const char *p;
+	const char *p;
 	{
 	do {
 		if (! is_digit(*p))
diff --git a/bin/sh/output.h b/bin/sh/output.h
index 02bddaa..5979819 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -34,12 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ *	$Id: output.h,v 1.6 1997/02/22 13:58:41 peter Exp $
  */
 
 #ifndef OUTPUT_INCL
 
-#if __STDC__
+#ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
diff --git a/bin/sh/show.c b/bin/sh/show.c
index c9c364e..cd7b195 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: show.c,v 1.7 1997/02/22 13:58:45 peter Exp $
  */
 
 #ifndef lint
@@ -41,7 +41,7 @@ static char const sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <stdio.h>
-#if __STDC__
+#ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -298,7 +298,7 @@ trputc(c)
 
 
 void
-#if __STDC__
+#ifdef __STDC__
 trace(const char *fmt, ...)
 #else
 trace(va_alist)
@@ -306,7 +306,7 @@ trace(va_alist)
 #endif
 {
 	va_list va;
-#if __STDC__
+#ifdef __STDC__
 	va_start(va, fmt);
 #else
 	char *fmt;
@@ -338,7 +338,7 @@ static void
 trstring(s)
 	char *s;
 {
-	register char *p;
+	char *p;
 	char c;
 
 	if (tracefile == NULL)
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 7a113e0..f80b75b 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: var.c,v 1.9 1997/02/22 13:58:47 peter Exp $
  */
 
 #ifndef lint
@@ -761,7 +761,7 @@ unsetvar(s)
 
 STATIC struct var **
 hashvar(p)
-	register char *p;
+	char *p;
 	{
 	unsigned int hashval;
 
@@ -781,7 +781,7 @@ hashvar(p)
 
 STATIC int
 varequal(p, q)
-	register char *p, *q;
+	char *p, *q;
 	{
 	while (*p == *q++) {
 		if (*p++ == '=')
-- 
cgit v1.1