d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sysinstall WARNS=2 clean.

Browse Source 
Approved by:	cperciva (mentor)
MFC after:	1 month
This commit is contained in:
randi 2010-06-11 20:56:40 +00:00
parent 9858f3bc4c
commit 562fa6d722
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/sysinstall/Makefile
View File

@ -14,13 +14,13 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
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

1
usr.sbin/sysinstall/install.c
View File

@ -357,7 +357,6 @@ installFixitUSB(dialogMenuItem *self)
int
installFixitCDROM(dialogMenuItem *self)
{
struct stat sb;
int need_eject;
if (!RunningAsInit)

2
usr.sbin/sysinstall/installUpgrade.c
View File

@ -368,7 +368,7 @@ installUpgrade(dialogMenuItem *self)
"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"

4
usr.sbin/sysinstall/media.c
View File

@ -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;

2
usr.sbin/sysinstall/system.c
View File

@ -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);
}

1
usr.sbin/sysinstall/tcpip.c
View File

@ -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)