svn commit: r209069 - head/usr.sbin/sysinstall

[Randi Harper]

Author: randi
Date: Fri Jun 11 20:56:40 2010
New Revision: 209069
URL: http://svn.freebsd.org/changeset/base/209069

Log:
  Make sysinstall WARNS=2 clean.
  
  Approved by:	cperciva (mentor)
  MFC after:	1 month

Modified:
  head/usr.sbin/sysinstall/Makefile
  head/usr.sbin/sysinstall/install.c
  head/usr.sbin/sysinstall/installUpgrade.c
  head/usr.sbin/sysinstall/media.c
  head/usr.sbin/sysinstall/system.c
  head/usr.sbin/sysinstall/tcpip.c

Modified: head/usr.sbin/sysinstall/Makefile
==============================================================================
--- head/usr.sbin/sysinstall/Makefile	Fri Jun 11 20:54:27 2010	(r209068)
+++ head/usr.sbin/sysinstall/Makefile	Fri Jun 11 20:56:40 2010	(r209069)
@@ -14,13 +14,13 @@ SRCS=	anonFTP.c cdrom.c command.c config
 	system.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
 	variable.c ${_wizard} keymap.h countries.h
 
-CFLAGS+= -DUSE_GZIP=1
+CFLAGS+= -DUSE_GZIP=1 -fno-strict-aliasing
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
 .endif
 CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
 
-WARNS?=	1
+WARNS?=  2	
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lutil -ldisk -lftpio

Modified: head/usr.sbin/sysinstall/install.c
==============================================================================
--- head/usr.sbin/sysinstall/install.c	Fri Jun 11 20:54:27 2010	(r209068)
+++ head/usr.sbin/sysinstall/install.c	Fri Jun 11 20:56:40 2010	(r209069)
@@ -357,7 +357,6 @@ installFixitUSB(dialogMenuItem *self)
 int
 installFixitCDROM(dialogMenuItem *self)
 {
-    struct stat sb;
     int need_eject;
 
     if (!RunningAsInit)

Modified: head/usr.sbin/sysinstall/installUpgrade.c
==============================================================================
--- head/usr.sbin/sysinstall/installUpgrade.c	Fri Jun 11 20:54:27 2010	(r209068)
+++ head/usr.sbin/sysinstall/installUpgrade.c	Fri Jun 11 20:56:40 2010	(r209069)
@@ -368,7 +368,7 @@ media:
 	       "Next comes stage 2, where we attempt to resurrect your /etc\n"
 	       "directory!");
 
-    if (saved_etc && chdir(saved_etc)) {
+    if (chdir(saved_etc)) {
 	msgConfirm("Unable to go to your saved /etc directory in %s?!  Argh!\n"
 		   "Something went seriously wrong!  It's quite possible that\n"
 		   "your former /etc is toast.  I hope you didn't have any\n"

Modified: head/usr.sbin/sysinstall/media.c
==============================================================================
--- head/usr.sbin/sysinstall/media.c	Fri Jun 11 20:54:27 2010	(r209068)
+++ head/usr.sbin/sysinstall/media.c	Fri Jun 11 20:56:40 2010	(r209069)
@@ -350,7 +350,7 @@ mediaSetFTP(dialogMenuItem *self)
 	}
 	urllen = strlen(cp);
 	if (urllen >= sizeof(ftpDevice.name)) {
-	    msgConfirm("Length of specified URL is %d characters. Allowable maximum is %d.",
+	    msgConfirm("Length of specified URL is %zu characters. Allowable maximum is %zu.",
 			urllen,sizeof(ftpDevice.name)-1);
 	    variable_unset(VAR_FTP_PATH);
 	    return DITEM_FAILURE;
@@ -563,7 +563,7 @@ mediaSetNFS(dialogMenuItem *self)
     }
     pathlen = strlen(hostname);
     if (pathlen >= sizeof(nfsDevice.name)) {
-	msgConfirm("Length of specified NFS path is %d characters. Allowable maximum is %d.",
+	msgConfirm("Length of specified NFS path is %zu characters. Allowable maximum is %zu.",
 		   pathlen,sizeof(nfsDevice.name)-1);
 	variable_unset(VAR_NFS_PATH);
 	return DITEM_FAILURE;

Modified: head/usr.sbin/sysinstall/system.c
==============================================================================
--- head/usr.sbin/sysinstall/system.c	Fri Jun 11 20:54:27 2010	(r209068)
+++ head/usr.sbin/sysinstall/system.c	Fri Jun 11 20:56:40 2010	(r209069)
@@ -524,7 +524,7 @@ systemCreateHoloshell(void)
 	        printf("Type ``exit'' in this fixit shell to resume sysinstall.\n\n");
 		fflush(stdout);
 	    }
-	    execlp("sh", "-sh", 0);
+	    execlp("sh", "-sh", NULL);
 	    msgDebug("Was unable to execute sh for Holographic shell!\n");
 	    exit(1);
 	}

Modified: head/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- head/usr.sbin/sysinstall/tcpip.c	Fri Jun 11 20:54:27 2010	(r209068)
+++ head/usr.sbin/sysinstall/tcpip.c	Fri Jun 11 20:56:40 2010	(r209069)
@@ -649,7 +649,6 @@ tcpDeviceScan(void)
 	int s;
 	struct ifmediareq ifmr;
 	struct ifaddrs *ifap, *ifa;
-	struct if_data *ifd;
 	char *network_dev;
 
 	if ((s = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0)