From fc99e5ea7ca2ac4880b168cafdedf7400a97ef88 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Sun, 12 Apr 2009 23:34:11 +0000
Subject: [PATCH] Fix -Wextra and -Wsign-compare issues

---
 usr.bin/nfsstat/nfsstat.c | 12 ++++++------
 usr.bin/nl/nl.c           | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 62b4c681b1ca..9904991d5aa8 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsstat.c,v 1.22 2008/07/21 14:19:24 lukem Exp $	*/
+/*	$NetBSD: nfsstat.c,v 1.23 2009/04/12 23:34:11 lukem Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\
 #if 0
 static char sccsid[] = "from: @(#)nfsstat.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: nfsstat.c,v 1.22 2008/07/21 14:19:24 lukem Exp $");
+__RCSID("$NetBSD: nfsstat.c,v 1.23 2009/04/12 23:34:11 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,8 +70,8 @@ __RCSID("$NetBSD: nfsstat.c,v 1.22 2008/07/21 14:19:24 lukem Exp $");
 
 struct nlist nl[] = {
 #define	N_NFSSTAT	0
-	{ "_nfsstats" },
-	{ "" },
+	{ "_nfsstats", 0, 0, 0, 0 },
+	{ "", 0, 0, 0, 0 },
 };
 
 #define	MASK(a)	(1 << NFSPROC_##a)
@@ -404,7 +404,7 @@ sidewaysintpr(interval)
 	memset(&last, 0, sizeof(last));
 
 	for (hdrcnt = 1;;) {
-		int i;
+		size_t i;
 
 		if (!--hdrcnt) {
 			printhdr();
@@ -453,7 +453,7 @@ sidewaysintpr(interval)
 void
 printhdr()
 {
-	int i;
+	size_t i;
 
 	printf("        ");
 	for (i = 0; i < NSHORTPROC; i++)
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index 399db575c621..b4025a3a790a 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nl.c,v 1.9 2008/07/21 14:19:24 lukem Exp $	*/
+/*	$NetBSD: nl.c,v 1.10 2009/04/12 23:37:12 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1999\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: nl.c,v 1.9 2008/07/21 14:19:24 lukem Exp $");
+__RCSID("$NetBSD: nl.c,v 1.10 2009/04/12 23:37:12 lukem Exp $");
 #endif    
 
 #include <errno.h>
@@ -69,9 +69,9 @@ struct numbering_property {
 #define NP_LAST		HEADER
 
 static struct numbering_property numbering_properties[NP_LAST + 1] = {
-	{ "footer",	number_none	},
-	{ "body",	number_nonempty	},
-	{ "header",	number_none	}
+	{ "footer",	number_none,	{ 0, 0, 0, 0 } },
+	{ "body",	number_nonempty, { 0, 0, 0, 0 } },
+	{ "header",	number_none,	{ 0, 0, 0, 0 } },
 };
 
 #define max(a, b)	((a) > (b) ? (a) : (b))
@@ -276,7 +276,7 @@ main(argc, argv)
 	}
 
 	/* Allocate a buffer suitable for preformatting line number. */
-	intbuffersize = max(INT_STRLEN_MAXIMUM, width) + 1;	/* NUL */
+	intbuffersize = max((int)INT_STRLEN_MAXIMUM, width) + 1; /* NUL */
 	if ((intbuffer = malloc(intbuffersize)) == NULL) {
 		perror("cannot allocate preformatting buffer");
 		exit(EXIT_FAILURE);