? diff ? keymap.h ? makedevs.c ? patch ? rtermcap ? sysinstall ? sysinstall.8.gz ? sysinstall.debug ? sysinstall.diff ? t.c Index: Makefile =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/Makefile,v retrieving revision 1.117 diff -u -r1.117 Makefile --- Makefile 2001/09/05 07:12:19 1.117 +++ Makefile 2001/09/22 23:20:25 @@ -10,7 +10,7 @@ system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \ variable.c wizard.c keymap.h -CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. +CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. -Wall -Werror .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif Index: disks.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/disks.c,v retrieving revision 1.128 diff -u -r1.128 disks.c --- disks.c 2001/04/18 20:26:28 1.128 +++ disks.c 2001/09/22 23:20:25 @@ -98,7 +98,7 @@ #ifndef PC98 if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { dialog_clear_norefresh(); - msgConfirm("WARNING: A geometry of %d/%d/%d for %s is incorrect. Using\n" + msgConfirm("WARNING: A geometry of %ld/%ld/%ld for %s is incorrect. Using\n" "a more likely geometry. If this geometry is incorrect or you\n" "are unsure as to whether or not it's correct, please consult\n" "the Hardware Guide in the Documentation submenu or use the\n" @@ -276,7 +276,12 @@ void diskPartition(Device *dev) { - char *cp, *p; +#ifdef __alpha__ + char *cp __unused; +#else + char *cp; +#endif + char *p; int rv, key = 0; Boolean chunking; char *msg = NULL; @@ -688,7 +693,7 @@ if (read(fd, cp, sb.st_size) != sb.st_size) { free(cp); close(fd); - msgDebug("bootalloc: couldn't read %d bytes from %s\n", sb.st_size, buf); + msgDebug("bootalloc: couldn't read %d bytes from %s\n", (int)sb.st_size, buf); return NULL; } close(fd); Index: dist.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.c,v retrieving revision 1.196 diff -u -r1.196 dist.c --- dist.c 2001/09/14 08:51:17 1.196 +++ dist.c 2001/09/22 23:20:26 @@ -466,7 +466,7 @@ cp = alloca(strlen(tmp) + 1); if (!cp) - msgFatal("Couldn't alloca() %d bytes!\n", strlen(tmp) + 1); + msgFatal("Couldn't alloca() %d bytes!\n", (int)(strlen(tmp) + 1)); strcpy(cp, tmp); while (cp) { if ((cp2 = index(cp, ' ')) != NULL) @@ -492,7 +492,7 @@ cp = alloca(strlen(tmp) + 1); if (!cp) - msgFatal("Couldn't alloca() %d bytes!\n", strlen(tmp) + 1); + msgFatal("Couldn't alloca() %d bytes!\n", (int)(strlen(tmp) + 1)); strcpy(cp, tmp); while (cp) { if ((cp2 = index(cp, ' ')) != NULL) Index: dmenu.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/dmenu.c,v retrieving revision 1.44 diff -u -r1.44 dmenu.c --- dmenu.c 2000/03/08 14:20:26 1.44 +++ dmenu.c 2001/09/22 23:20:26 @@ -287,16 +287,23 @@ dialog_clear_norefresh(); /* Pop up that dialog! */ if (menu->type & DMENU_NORMAL_TYPE) - rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt, -1, -1, - menu_height(menu, n), -n, items, (char *)buttons, choice, scroll); - + rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt, + -1, -1, menu_height(menu, n), -n, items, + buttons ? (unsigned char *)&buttons : NULL, + choice, scroll); else if (menu->type & DMENU_RADIO_TYPE) - rval = dialog_radiolist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1, - menu_height(menu, n), -n, items, (char *)buttons); + rval = dialog_radiolist((u_char *)menu->title, + (u_char *)menu->prompt, -1, -1, + menu_height(menu, n), -n, items, + buttons ? (unsigned char *)&buttons : + NULL); else if (menu->type & DMENU_CHECKLIST_TYPE) - rval = dialog_checklist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1, - menu_height(menu, n), -n, items, (char *)buttons); + rval = dialog_checklist((u_char *)menu->title, + (u_char *)menu->prompt, -1, -1, + menu_height(menu, n), -n, items, + buttons ? (unsigned char *)&buttons : + NULL); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); if (exited) { Index: install.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/install.c,v retrieving revision 1.306 diff -u -r1.306 install.c --- install.c 2001/09/14 18:29:08 1.306 +++ install.c 2001/09/22 23:20:26 @@ -496,8 +496,11 @@ int installStandard(dialogMenuItem *self) { - int i, tries = 0; + int i; +#ifndef __alpha__ + int tries = 0; Device **devs; +#endif variable_set2(SYSTEM_STATE, "standard", 0); dialog_clear_norefresh(); @@ -747,10 +750,12 @@ installFixupBin(dialogMenuItem *self) { Device **devs; - char *cp; int i; +#ifdef __i386__ + char *cp; FILE *fp; int kstat = 1; +#endif /* All of this is done only as init, just to be safe */ if (RunningAsInit) { @@ -1035,7 +1040,7 @@ getRelname(void) { static char buf[64]; - int sz = (sizeof buf) - 1; + size_t sz = (sizeof buf) - 1; if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) { buf[sz] = '\0'; Index: menus.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v retrieving revision 1.324 diff -u -r1.324 menus.c --- menus.c 2001/09/05 07:41:01 1.324 +++ menus.c 2001/09/22 23:20:26 @@ -1350,7 +1350,7 @@ { " NFS server", "This machine will be an NFS server", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, { " Ntpdate", "Select a clock-synchronization server", - dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" }, + dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (long)"ntpdate_enable=YES" }, { " PCNFSD", "Run authentication server for clients with PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, { " portmap", "This machine wants to run the portmapper daemon",