Author: eadler
Date: Fri Mar 16 03:22:37 2012
New Revision: 233021
URL: http://svn.freebsd.org/changeset/base/233021
Log:
MFC r22990[45] and r229907-r229919:
- fix a variety of warnings produced by gcc46 when compiling world
Approved by (cperciva)
Modified:
stable/8/usr.bin/brandelf/brandelf.c
stable/8/usr.bin/bsdiff/bsdiff/bsdiff.c
stable/8/usr.bin/ncplist/ncplist.c
stable/8/usr.bin/netstat/if.c
stable/8/usr.bin/split/split.c
Directory Properties:
stable/8/sbin/tunefs/ (props changed)
stable/8/usr.bin/brandelf/ (props changed)
stable/8/usr.bin/bsdiff/ (props changed)
stable/8/usr.bin/ncplist/ (props changed)
stable/8/usr.bin/netstat/ (props changed)
stable/8/usr.bin/split/ (props changed)
Modified: stable/8/usr.bin/brandelf/brandelf.c
==============================================================================
--- stable/8/usr.bin/brandelf/brandelf.c Fri Mar 16 03:16:10 2012
(r233020)
+++ stable/8/usr.bin/brandelf/brandelf.c Fri Mar 16 03:22:37 2012
(r233021)
@@ -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/8/usr.bin/bsdiff/bsdiff/bsdiff.c
==============================================================================
--- stable/8/usr.bin/bsdiff/bsdiff/bsdiff.c Fri Mar 16 03:16:10 2012
(r233020)
+++ stable/8/usr.bin/bsdiff/bsdiff/bsdiff.c Fri Mar 16 03:22:37 2012
(r233021)
@@ -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/8/usr.bin/ncplist/ncplist.c
==============================================================================
--- stable/8/usr.bin/ncplist/ncplist.c Fri Mar 16 03:16:10 2012
(r233020)
+++ stable/8/usr.bin/ncplist/ncplist.c Fri Mar 16 03:22:37 2012
(r233021)
@@ -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/8/usr.bin/netstat/if.c
==============================================================================
--- stable/8/usr.bin/netstat/if.c Fri Mar 16 03:16:10 2012
(r233020)
+++ stable/8/usr.bin/netstat/if.c Fri Mar 16 03:22:37 2012
(r233021)
@@ -192,7 +192,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;
@@ -256,7 +255,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/8/usr.bin/split/split.c
==============================================================================
--- stable/8/usr.bin/split/split.c Fri Mar 16 03:16:10 2012
(r233020)
+++ stable/8/usr.bin/split/split.c Fri Mar 16 03:22:37 2012
(r233021)
@@ -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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
