Wall cleanup

5 files changed, 15 insertions, 12 deletions

diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index d1efae77903..f400981d26d 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gnum4.c,v 1.8 2000/07/24 23:08:25 espie Exp $ */
+/* $OpenBSD: gnum4.c,v 1.9 2001/07/28 05:36:18 pvalchev Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie
@@ -368,7 +368,6 @@ do_regexp(string, re, replace, pm)
 	regmatch_t *pm;
 {
 	int error;
-	const char *p;
 
 	switch(error = regexec(re, string, re->re_nsub+1, pm, 0)) {
 	case 0: 
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 771afc878a5..6f3ee902b90 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.39 2001/03/05 15:09:20 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.40 2001/07/28 05:36:18 pvalchev Exp $	*/
 /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.39 2001/03/05 15:09:20 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.40 2001/07/28 05:36:18 pvalchev Exp $";
 #endif
 #endif /* not lint */
 
@@ -177,7 +177,6 @@ main(argc,argv)
 	int c;
 	int n;
 	char *p;
-	FILE *ifp;
 
 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
 		signal(SIGINT, onintr);
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 84e0375c85d..d758bb8ef99 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.c,v 1.15 2001/06/22 14:57:20 lebel Exp $	*/
+/*	$OpenBSD: netstat.c,v 1.16 2001/07/28 05:36:18 pvalchev Exp $	*/
 /*	$NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: netstat.c,v 1.15 2001/06/22 14:57:20 lebel Exp $";
+static char rcsid[] = "$OpenBSD: netstat.c,v 1.16 2001/07/28 05:36:18 pvalchev Exp $";
 #endif /* not lint */
 
 /*
@@ -73,6 +73,7 @@ static char rcsid[] = "$OpenBSD: netstat.c,v 1.15 2001/06/22 14:57:20 lebel Exp
 #include <netdb.h>
 #include <stdlib.h>
 #include <string.h>
+#include <err.h>
 #include <nlist.h>
 #include <paths.h>
 #include "systat.h"
@@ -212,7 +213,7 @@ again:
 	while (next != head) {
 		KREAD(next, &inpcb, sizeof (inpcb));
 		if (inpcb.inp_queue.cqe_prev != prev) {
-printf("prev = %x, head = %x, next = %x, inpcb...prev = %x\n", prev, head, next, inpcb.inp_queue.cqe_prev);
+printf("prev = %p, head = %p, next = %p, inpcb...prev = %p\n", prev, head, next, inpcb.inp_queue.cqe_prev);
 			p = netcb.nif_forw;
 			for (; p != (struct netinfo *)&netcb; p = p->nif_forw)
 				p->nif_seen = 1;
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 7c61dcda310..5de9325f36b 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pigs.c,v 1.7 2001/05/04 16:48:34 ericj Exp $	*/
+/*	$OpenBSD: pigs.c,v 1.8 2001/07/28 05:36:18 pvalchev Exp $	*/
 /*	$NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 #endif
-static char rcsid[] = "$OpenBSD: pigs.c,v 1.7 2001/05/04 16:48:34 ericj Exp $";
+static char rcsid[] = "$OpenBSD: pigs.c,v 1.8 2001/07/28 05:36:18 pvalchev Exp $";
 #endif /* not lint */
 
 /*
@@ -56,6 +56,7 @@ static char rcsid[] = "$OpenBSD: pigs.c,v 1.7 2001/05/04 16:48:34 ericj Exp $";
 #include <math.h>
 #include <nlist.h>
 #include <pwd.h>
+#include <err.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 0bc67bbabcf..885fa90e137 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
-/*	$OpenBSD: vmstat.c,v 1.57 2001/06/27 06:16:50 art Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.58 2001/07/28 05:36:18 pvalchev Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1991, 1993
@@ -711,9 +711,12 @@ dointr()
 	time_t uptime;
 	u_long intrstray[16];
 	char iname[17], fname[31];
-	int i, mib[2], l, incflag;
+	int i;
+#if 0
+	int mib[2], l, incflag;
 	size_t size;
 	char *intrnames, *intrcount, *intrn, *intrc, *buf1, *buf2;
+#endif
 
 	iname[16] = '\0';
 	uptime = getuptime();