5 files changed, 12 insertions, 6 deletions

diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index 0a1a040c3fcc..b1c2e8ec9a6d 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -125,7 +125,8 @@ expand(char *fname)
 void
 systemInitialize(int argc, char **argv)
 {
-    int i, boothowto;
+    size_t i;
+    int boothowto;
     sigset_t signalset;
 
     signal(SIGINT, SIG_IGN);
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 680edf05d2bc..b085092cc6ca 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -36,6 +36,8 @@
 
 #include "sysinstall.h"
 #include <ctype.h>
+#include <curses.h>
+#include <term.h>
 
 int fixitTtyWhich(dialogMenuItem *);
 int termSetType(dialogMenuItem *);
@@ -174,7 +176,7 @@ value_of(Option opt)
 	return (char *)opt.data;
 
     case OPT_IS_INT:
-	sprintf(ival, "%d", (int)opt.data);
+	sprintf(ival, "%lu", (long)opt.data);
 	return ival;
 
     case OPT_IS_FUNC:
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 0a1a040c3fcc..b1c2e8ec9a6d 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -125,7 +125,8 @@ expand(char *fname)
 void
 systemInitialize(int argc, char **argv)
 {
-    int i, boothowto;
+    size_t i;
+    int boothowto;
     sigset_t signalset;
 
     signal(SIGINT, SIG_IGN);
diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c
index 256fe953bf03..a5ce339fc708 100644
--- a/usr.sbin/sysinstall/tape.c
+++ b/usr.sbin/sysinstall/tape.c
@@ -70,11 +70,13 @@ mediaGetTape(Device *dev, char *file, Boolean probe)
     if (!tapeInitted) {
 	WINDOW *w = savescr();
 
-	msgDebug("Tape init routine called for %s (private dir is %s)\n", dev->name, dev->private);
+	msgDebug("Tape init routine called for %s (private dir is %s)\n", 
+	    dev->name, (char *)dev->private);
 	Mkdir(dev->private);
 	if (chdir(dev->private)) {
 	    msgConfirm("Unable to CD to %s before extracting tape!\n"
-		       "Tape media is not selected and thus cannot be installed from.", dev->private);
+		       "Tape media is not selected and thus cannot be installed from.", 
+		       (char *)dev->private);
 	    return (FILE *)IO_ERROR;
 	}
 	/* We know the tape is already in the drive, so go for it */
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index ca219f6d5fe9..0ca7e79e4bf5 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -359,7 +359,7 @@ tcpOpenDialog(Device *devp)
 	if (!variable_cmp(VAR_TRY_RTSOL, "YES") || 
 	    (variable_get(VAR_TRY_RTSOL)==0 && !msgNoYes("Do you want to try IPv6 configuration of the interface?"))) {
 	    int i;
-	    int len;
+	    size_t len;
 
 	    i = 0;
 	    sysctlbyname("net.inet6.ip6.forwarding", NULL, 0, &i, sizeof(i));