-Wall cleanup; ok deraadt

3 files changed, 37 insertions, 5 deletions

diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index ffa71c41c29..f3e6f935029 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: hexdump.h,v 1.2 1996/06/26 05:34:19 deraadt Exp $*/
+/* *	$OpenBSD: hexdump.h,v 1.3 2001/09/30 07:17:03 pvalchev Exp $*/
 /*
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
@@ -75,3 +75,25 @@ extern FS *fshead;			/* head of format strings list */
 extern int blocksize;			/* data block size */
 enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
 char *emalloc();
+
+void	bpad __P((PR *));
+void	conv_c __P((PR *, u_char *));
+void	conv_u __P((PR *, u_char *));
+int	next __P((char **));
+void	doskip __P((char *, int));
+void	nomem __P((void));
+void	odoffset __P((int, char ***));
+void	newsyntax __P((int, char ***));
+void	oldsyntax __P((int, char ***));
+int	size __P((FS *));
+void	rewrite __P((FS *));
+void	display __P((void));
+void	badcnt __P((char *));
+void	add __P((char *));
+void	addfile __P((char *));
+void	badcnt __P((char *));
+void	badconv __P((char *));
+void	badfmt __P((char *));
+void	badsfmt __P((void));
+void	escape __P((char *));
+void	usage __P((void));
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 8bd665ab707..ae38ff61e1b 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: odsyntax.c,v 1.5 2001/07/18 17:17:39 pvalchev Exp $	*/
+/*	$OpenBSD: odsyntax.c,v 1.6 2001/09/30 07:17:03 pvalchev Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)odsyntax.c	5.4 (Berkeley) 3/8/91";*/
-static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.5 2001/07/18 17:17:39 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.6 2001/09/30 07:17:03 pvalchev Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -46,6 +46,7 @@ static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.5 2001/07/18 17:17:39 pvalchev E
 
 int deprecated;
 
+void
 oldsyntax(argc, argvp)
 	int argc;
 	char ***argvp;
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 7422db9ee4f..db8b6ed7d76 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.5 1999/02/07 20:54:09 aaron Exp $	*/
+/*	$OpenBSD: parse.c,v 1.6 2001/09/30 07:17:03 pvalchev Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)parse.c	5.6 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.5 1999/02/07 20:54:09 aaron Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.6 2001/09/30 07:17:03 pvalchev Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -48,6 +48,7 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.5 1999/02/07 20:54:09 aaron Exp $";
 
 FU *endfu;					/* format at end-of-data */
 
+void
 addfile(name)
 	char *name;
 {
@@ -74,6 +75,7 @@ addfile(name)
 	(void)fclose(fp);
 }
 
+void
 add(fmt)
 	char *fmt;
 {
@@ -152,6 +154,7 @@ add(fmt)
 }
 
 static char *spec = ".#-+ 0123456789";
+int
 size(fs)
 	FS *fs;
 {
@@ -205,6 +208,7 @@ size(fs)
 	return(cursize);
 }
 
+void
 rewrite(fs)
 	FS *fs;
 {
@@ -445,6 +449,7 @@ sw2:					switch(fu->bcnt) {
 }
 
 
+void
 escape(p1)
 	register char *p1;
 {
@@ -487,6 +492,7 @@ escape(p1)
 	}
 }
 
+void
 badcnt(s)
 	char *s;
 {
@@ -495,6 +501,7 @@ badcnt(s)
 	exit(1);
 }
 
+void
 badsfmt()
 {
 	(void)fprintf(stderr,
@@ -502,6 +509,7 @@ badsfmt()
 	exit(1);
 }
 
+void
 badfmt(fmt)
 	char *fmt;
 {
@@ -509,6 +517,7 @@ badfmt(fmt)
 	exit(1);
 }
 
+void
 badconv(ch)
 	char *ch;
 {