From 41d483d9518c48771a4cbda504eafd81a4ec616c Mon Sep 17 00:00:00 2001
From: eadler <eadler@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 16 Mar 2012 03:22:37 +0000
Subject: [PATCH] MFC r22990[45] and r229907-r229919:

- fix a variety of warnings produced by gcc46 when compiling world

Approved by (cperciva)


git-svn-id: svn://svn.freebsd.org/base/stable/8@233021 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.bin/brandelf/brandelf.c    | 4 ++--
 usr.bin/bsdiff/bsdiff/bsdiff.c | 2 +-
 usr.bin/ncplist/ncplist.c      | 7 +------
 usr.bin/netstat/if.c           | 2 --
 usr.bin/split/split.c          | 3 ---
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 9cd391eb5..610b6f3a7 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -64,7 +64,7 @@ main(int argc, char **argv)
 	const char *strtype = "FreeBSD";
 	int type = ELFOSABI_FREEBSD;
 	int retval = 0;
-	int ch, change = 0, verbose = 0, force = 0, listed = 0;
+	int ch, change = 0, force = 0, listed = 0;
 
 	while ((ch = getopt(argc, argv, "f:lt:v")) != -1)
 		switch (ch) {
@@ -84,7 +84,7 @@ main(int argc, char **argv)
 			listed = 1;
 			break;
 		case 'v':
-			verbose = 1;
+			/* does nothing */
 			break;
 		case 't':
 			if (force)
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 005ad4d16..8b764da1d 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -272,7 +272,7 @@ int main(int argc,char *argv[])
 	/* Compute the differences, writing ctrl as we go */
 	if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL)
 		errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err);
-	scan=0;len=0;
+	scan=0;len=0;pos=0;
 	lastscan=0;lastpos=0;lastoffset=0;
 	while(scan<newsize) {
 		oldscore=0;
diff --git a/usr.bin/ncplist/ncplist.c b/usr.bin/ncplist/ncplist.c
index e2c2ce413..fb9728df6 100644
--- a/usr.bin/ncplist/ncplist.c
+++ b/usr.bin/ncplist/ncplist.c
@@ -373,7 +373,7 @@ enum listop {
 int
 main(int argc, char *argv[])
 {
-	int opt, wdone = 0, nargs = 0, i;
+	int opt, nargs = 0, i;
 	enum listop what;
 	char *args[MAX_ARGS];
 
@@ -436,23 +436,18 @@ main(int argc, char *argv[])
 	switch(what) {
 	    case LO_SERVERS:
 		show_serverlist(args[0]);
-		wdone = 1;
 		break;
 	    case LO_USERS:
 		show_userlist(args[0]);
-		wdone = 1;
 		break;
 	    case LO_QUEUES:
 		show_queuelist(args[0], args[1]);
-		wdone = 1;
 		break;
 	    case LO_VOLUMES:
 		list_volumes(args[0]);
-		wdone = 1;
 		break;
 	    case LO_BINDERY:
 		list_bindery(args[0], args[1], args[2]);
-		wdone = 1;
 		break;
 	    default:
 		help();
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index cdfeedf97..434300afe 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -192,7 +192,6 @@ intpr(int interval1, u_long ifnetaddr, void (*pfunc)(char *))
 	} ifaddr;
 	u_long ifaddraddr;
 	u_long ifaddrfound;
-	u_long ifnetfound;
 	u_long opackets;
 	u_long ipackets;
 	u_long obytes;
@@ -256,7 +255,6 @@ intpr(int interval1, u_long ifnetaddr, void (*pfunc)(char *))
 		link_layer = 0;
 
 		if (ifaddraddr == 0) {
-			ifnetfound = ifnetaddr;
 			if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) != 0)
 				return;
 			strlcpy(name, ifnet.if_xname, sizeof(name));
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index 22818e41c..1c27bdd88 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -351,17 +351,14 @@ newfile(void)
 {
 	long i, maxfiles, tfnum;
 	static long fnum;
-	static int defname;
 	static char *fpnt;
 
 	if (ofd == -1) {
 		if (fname[0] == '\0') {
 			fname[0] = 'x';
 			fpnt = fname + 1;
-			defname = 1;
 		} else {
 			fpnt = fname + strlen(fname);
-			defname = 0;
 		}
 		ofd = fileno(stdout);
 	}
-- 
2.45.0