err.[ch] -> error.[ch] and fix err/warn usage.

5 files changed, 18 insertions, 20 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 0040a780af7..5aa785e905c 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:34:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/09/22 05:09:13 millert Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -10,7 +10,7 @@ DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
 #CFLAGS+=-g
 #CFLAGS+=-Wall -ansi -pedantic
 CFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
-SRCS=	alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
+SRCS=	alloc.c char.c const.c csh.c dir.c dol.c error.c exec.c exp.c file.c \
 	func.c glob.c hist.c init.c lex.c misc.c parse.c printf.c proc.c \
 	sem.c set.c str.c time.c
 #.PATH:	${.CURDIR}/../../usr.bin/printf
@@ -19,11 +19,11 @@ MLINKS=	csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
 	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
 	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
 	csh.1 stop.1 csh.1 source.1
-CLEANFILES+=err.h const.h
+CLEANFILES+=error.h const.h
 
-const.h: err.h
+const.h: error.h
 
-err.h: err.c
+error.h: error.c
 	@rm -f $@
 	@echo '/* Do not edit this file, make creates it. */' > $@
 	@echo '#ifndef _h_sh_err' >> $@
@@ -38,7 +38,7 @@ const.h: const.c
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> $@
 
-.depend alloc.o: const.h err.h 
+.depend alloc.o: const.h error.h 
 
 .if make(install)
 SUBDIR+= USD.doc
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index b0dc2a28d3f..a1911ce6161 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csh.h,v 1.2 1996/06/23 14:19:16 deraadt Exp $	*/
+/*	$OpenBSD: csh.h,v 1.3 1997/09/22 05:09:13 millert Exp $	*/
 /*	$NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $	*/
 
 /*-
@@ -86,7 +86,7 @@ typedef void *ptr_t;
 
 #include "const.h"
 #include "char.h"
-#include "err.h"
+#include "error.h"
 
 #define xmalloc(i)	Malloc(i)
 #define xrealloc(p, i)	Realloc(p, i)
diff --git a/bin/csh/err.c b/bin/csh/error.c
index ac470682ad6..0900bfa5c20 100644
--- a/bin/csh/err.c
+++ b/bin/csh/error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: err.c,v 1.5 1997/07/25 18:58:03 mickey Exp $	*/
+/*	$OpenBSD: error.c,v 1.1 1997/09/22 05:09:14 millert Exp $	*/
 /*	$NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: err.c,v 1.5 1997/07/25 18:58:03 mickey Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.1 1997/09/22 05:09:14 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/printf.c b/bin/csh/printf.c
index 08caba6fa0e..af04f5b677c 100644
--- a/bin/csh/printf.c
+++ b/bin/csh/printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printf.c,v 1.6 1997/01/15 23:40:22 millert Exp $	*/
+/*	$OpenBSD: printf.c,v 1.7 1997/09/22 05:09:14 millert Exp $	*/
 /*	$NetBSD: printf.c,v 1.6 1995/03/21 09:03:15 cgd Exp $	*/
 
 /*
@@ -46,7 +46,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 7/20/93";
 #else
-static char rcsid[] = "$OpenBSD: printf.c,v 1.6 1997/01/15 23:40:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.7 1997/09/22 05:09:14 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -131,8 +131,7 @@ next:		for (start = fmt;; ++fmt) {
 			if (!*fmt) {
 				/* avoid infinite loop */
 				if (end == 1) {
-					warnx("missing format character",
-					    NULL, NULL);
+					warnx("missing format character");
 					return (1);
 				}
 				end = 1;
@@ -174,7 +173,7 @@ next:		for (start = fmt;; ++fmt) {
 		/* skip to conversion char */
 		for (; strchr(skip2, *fmt); ++fmt);
 		if (!*fmt) {
-			warnx("missing format character", NULL, NULL);
+			warnx("missing format character");
 			return (1);
 		}
 
@@ -215,7 +214,7 @@ next:		for (start = fmt;; ++fmt) {
 			break;
 		}
 		default:
-			warnx("illegal format character", NULL, NULL);
+			warnx("illegal format character");
 			return (1);
 		}
 		*fmt = nextch;
@@ -348,7 +347,7 @@ getlong(lp)
 		errno = 0;
 		val = strtol(*gargv, &ep, 0);
 		if (*ep != '\0') {
-			warnx("%s: illegal number", *gargv, NULL);
+			warnx("%s: illegal number", *gargv);
 			return (1);
 		}
 		if (errno == ERANGE)
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index 1e1f52838f9..7729c8ba7f7 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.6 1997/08/04 19:24:02 deraadt Exp $	*/
+/*	$OpenBSD: proc.c,v 1.7 1997/09/22 05:09:15 millert Exp $	*/
 /*	$NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)proc.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: proc.c,v 1.6 1997/08/04 19:24:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: proc.c,v 1.7 1997/09/22 05:09:15 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,6 @@ static char rcsid[] = "$OpenBSD: proc.c,v 1.6 1997/08/04 19:24:02 deraadt Exp $"
 #else
 # include <varargs.h>
 #endif
-#include <err.h>
 
 #include "csh.h"
 #include "dir.h"