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.

5 files changed, 4 insertions, 5 deletions

diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 182bfac..9c736a8 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 4bd986d..4ff5cb2 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 af3f2e8..ea9d9e7 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 b0c6c66..0353fc6 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 4cef217..6c07ca5 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");