From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 16 05:00:41 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C1B74106564A;
	Thu, 16 Feb 2012 05:00:41 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A551C8FC0A;
	Thu, 16 Feb 2012 05:00:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1G50fDh099320;
	Thu, 16 Feb 2012 05:00:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1G50f3b099314;
	Thu, 16 Feb 2012 05:00:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201202160500.q1G50f3b099314@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 16 Feb 2012 05:00:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231811 - in stable/7/usr.bin: brandelf bsdiff/bsdiff
	ncplist netstat split
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Feb 2012 05:00:41 -0000

Author: eadler
Date: Thu Feb 16 05:00:41 2012
New Revision: 231811
URL: http://svn.freebsd.org/changeset/base/231811

Log:
  MFC r22990[45] and r229907-r229919:
  
  - fix a variety of warnings produced by gcc46 when compiling world
  
  Approved by (cperciva)

Modified:
  stable/7/usr.bin/brandelf/brandelf.c
  stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c
  stable/7/usr.bin/ncplist/ncplist.c
  stable/7/usr.bin/netstat/if.c
  stable/7/usr.bin/split/split.c
Directory Properties:
  stable/7/sbin/tunefs/   (props changed)
  stable/7/usr.bin/brandelf/   (props changed)
  stable/7/usr.bin/bsdiff/   (props changed)
  stable/7/usr.bin/ncplist/   (props changed)
  stable/7/usr.bin/netstat/   (props changed)
  stable/7/usr.bin/split/   (props changed)

Modified: stable/7/usr.bin/brandelf/brandelf.c
==============================================================================
--- stable/7/usr.bin/brandelf/brandelf.c	Thu Feb 16 03:27:38 2012	(r231810)
+++ stable/7/usr.bin/brandelf/brandelf.c	Thu Feb 16 05:00:41 2012	(r231811)
@@ -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)

Modified: stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c
==============================================================================
--- stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c	Thu Feb 16 03:27:38 2012	(r231810)
+++ stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c	Thu Feb 16 05:00:41 2012	(r231811)
@@ -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;

Modified: stable/7/usr.bin/ncplist/ncplist.c
==============================================================================
--- stable/7/usr.bin/ncplist/ncplist.c	Thu Feb 16 03:27:38 2012	(r231810)
+++ stable/7/usr.bin/ncplist/ncplist.c	Thu Feb 16 05:00:41 2012	(r231811)
@@ -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();

Modified: stable/7/usr.bin/netstat/if.c
==============================================================================
--- stable/7/usr.bin/netstat/if.c	Thu Feb 16 03:27:38 2012	(r231810)
+++ stable/7/usr.bin/netstat/if.c	Thu Feb 16 05:00:41 2012	(r231811)
@@ -189,7 +189,6 @@ intpr(int interval1, u_long ifnetaddr, v
 	} ifaddr;
 	u_long ifaddraddr;
 	u_long ifaddrfound;
-	u_long ifnetfound;
 	u_long opackets;
 	u_long ipackets;
 	u_long obytes;
@@ -252,7 +251,6 @@ intpr(int interval1, u_long ifnetaddr, v
 		link_layer = 0;
 
 		if (ifaddraddr == 0) {
-			ifnetfound = ifnetaddr;
 			if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) != 0)
 				return;
 			strlcpy(name, ifnet.if_xname, sizeof(name));

Modified: stable/7/usr.bin/split/split.c
==============================================================================
--- stable/7/usr.bin/split/split.c	Thu Feb 16 03:27:38 2012	(r231810)
+++ stable/7/usr.bin/split/split.c	Thu Feb 16 05:00:41 2012	(r231811)
@@ -294,17 +294,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);
 	}