From 404f4d4100b44af1d65e313c84567698e839c312 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sun, 12 Dec 1999 04:58:02 +0000 Subject: I shouldn't have incremented PART_OFF; it was wrong and broke label display to boot. Also fix some various warning fluff while I'm in here cleaning up. --- release/sysinstall/disks.c | 1 - release/sysinstall/install.c | 2 +- release/sysinstall/label.c | 2 +- release/sysinstall/system.c | 2 ++ release/sysinstall/tcpip.c | 2 -- usr.sbin/sade/disks.c | 1 - usr.sbin/sade/install.c | 2 +- usr.sbin/sade/label.c | 2 +- usr.sbin/sade/system.c | 2 ++ usr.sbin/sysinstall/disks.c | 1 - usr.sbin/sysinstall/install.c | 2 +- usr.sbin/sysinstall/label.c | 2 +- usr.sbin/sysinstall/system.c | 2 ++ usr.sbin/sysinstall/tcpip.c | 2 -- 14 files changed, 12 insertions(+), 13 deletions(-) diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 182bfaca4c12..9c736a895b8b 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -651,7 +651,6 @@ diskPartitionWrite(dialogMenuItem *self) return DITEM_SUCCESS; for (i = 0; devs[i]; i++) { - Chunk *c1; Disk *d = (Disk *)devs[i]->private; static u_char *boot1; #ifndef __alpha__ diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 4bd986dd5bfb..4ff5cb22809c 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -749,7 +749,7 @@ installFixupBin(dialogMenuItem *self) /* Snapshot any boot -c changes back to the new kernel */ cp = variable_get(VAR_KGET); if (cp && (*cp == 'Y' || *cp == 'y')) { - if (kstat = kget("/boot/kernel.conf")) { + if ((kstat = kget("/boot/kernel.conf")) != NULL) { msgConfirm("Kernel copied OK, but unable to save boot -c changes\n" "to it. See the debug screen (ALT-F2) for details."); } diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c index af3f2e844180..ea9d9e743fd9 100644 --- a/release/sysinstall/label.c +++ b/release/sysinstall/label.c @@ -426,7 +426,7 @@ getNewfsCmd(PartInfo *p) #define PART_MOUNT_COL 10 #define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3) #define PART_NEWFS_COL (PART_SIZE_COL + 8) -#define PART_OFF 40 +#define PART_OFF 38 #define TOTAL_AVAIL_LINES (10) #define PSLICE_SHOWABLE (4) diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index b0c6c66f5755..0353fc62e92f 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -259,6 +259,8 @@ systemChangeTerminal(char *color, const u_char c_term[], char *mono, const u_char m_term[]) { if (OnVTY) { + int setupterm(char *color, int, int *); + if (ColorDisplay) { setenv("TERM", color, 1); setenv("TERMCAP", c_term, 1); diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index 4cef217dc46b..6c07ca540d8c 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -219,8 +219,6 @@ tcpOpenDialog(Device *devp) /* First try a DHCP scan if such behavior is desired */ if (!variable_cmp(VAR_TRY_DHCP, "YES") || !msgYesNo("Do you want to try DHCP configuration of the interface?")) { - int k; - Mkdir("/var/db"); Mkdir("/var/run"); Mkdir("/tmp"); diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 182bfaca4c12..9c736a895b8b 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -651,7 +651,6 @@ diskPartitionWrite(dialogMenuItem *self) return DITEM_SUCCESS; for (i = 0; devs[i]; i++) { - Chunk *c1; Disk *d = (Disk *)devs[i]->private; static u_char *boot1; #ifndef __alpha__ diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 4bd986dd5bfb..4ff5cb22809c 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -749,7 +749,7 @@ installFixupBin(dialogMenuItem *self) /* Snapshot any boot -c changes back to the new kernel */ cp = variable_get(VAR_KGET); if (cp && (*cp == 'Y' || *cp == 'y')) { - if (kstat = kget("/boot/kernel.conf")) { + if ((kstat = kget("/boot/kernel.conf")) != NULL) { msgConfirm("Kernel copied OK, but unable to save boot -c changes\n" "to it. See the debug screen (ALT-F2) for details."); } diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index af3f2e844180..ea9d9e743fd9 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -426,7 +426,7 @@ getNewfsCmd(PartInfo *p) #define PART_MOUNT_COL 10 #define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3) #define PART_NEWFS_COL (PART_SIZE_COL + 8) -#define PART_OFF 40 +#define PART_OFF 38 #define TOTAL_AVAIL_LINES (10) #define PSLICE_SHOWABLE (4) diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index b0c6c66f5755..0353fc62e92f 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -259,6 +259,8 @@ systemChangeTerminal(char *color, const u_char c_term[], char *mono, const u_char m_term[]) { if (OnVTY) { + int setupterm(char *color, int, int *); + if (ColorDisplay) { setenv("TERM", color, 1); setenv("TERMCAP", c_term, 1); diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 182bfaca4c12..9c736a895b8b 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -651,7 +651,6 @@ diskPartitionWrite(dialogMenuItem *self) return DITEM_SUCCESS; for (i = 0; devs[i]; i++) { - Chunk *c1; Disk *d = (Disk *)devs[i]->private; static u_char *boot1; #ifndef __alpha__ diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 4bd986dd5bfb..4ff5cb22809c 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -749,7 +749,7 @@ installFixupBin(dialogMenuItem *self) /* Snapshot any boot -c changes back to the new kernel */ cp = variable_get(VAR_KGET); if (cp && (*cp == 'Y' || *cp == 'y')) { - if (kstat = kget("/boot/kernel.conf")) { + if ((kstat = kget("/boot/kernel.conf")) != NULL) { msgConfirm("Kernel copied OK, but unable to save boot -c changes\n" "to it. See the debug screen (ALT-F2) for details."); } diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index af3f2e844180..ea9d9e743fd9 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -426,7 +426,7 @@ getNewfsCmd(PartInfo *p) #define PART_MOUNT_COL 10 #define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3) #define PART_NEWFS_COL (PART_SIZE_COL + 8) -#define PART_OFF 40 +#define PART_OFF 38 #define TOTAL_AVAIL_LINES (10) #define PSLICE_SHOWABLE (4) diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index b0c6c66f5755..0353fc62e92f 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -259,6 +259,8 @@ systemChangeTerminal(char *color, const u_char c_term[], char *mono, const u_char m_term[]) { if (OnVTY) { + int setupterm(char *color, int, int *); + if (ColorDisplay) { setenv("TERM", color, 1); setenv("TERMCAP", c_term, 1); diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index 4cef217dc46b..6c07ca540d8c 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -219,8 +219,6 @@ tcpOpenDialog(Device *devp) /* First try a DHCP scan if such behavior is desired */ if (!variable_cmp(VAR_TRY_DHCP, "YES") || !msgYesNo("Do you want to try DHCP configuration of the interface?")) { - int k; - Mkdir("/var/db"); Mkdir("/var/run"); Mkdir("/tmp"); -- cgit v1.2.3