Silence more warnings.

6 files changed, 10 insertions, 9 deletions

diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index 3886e0e..8659962 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -98,7 +98,7 @@ print_chunks(Disk *d, int u)
 #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 %lu/%lu/%lu 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"
@@ -688,7 +688,7 @@ bootalloc(char *name)
 	    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 %ld bytes from %s\n", (long)sb.st_size, buf);
 		return NULL;
 	    }
 	    close(fd);
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 9937b27..4f4c223 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -1035,7 +1035,7 @@ static char *
 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';
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 3886e0e..8659962 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -98,7 +98,7 @@ print_chunks(Disk *d, int u)
 #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 %lu/%lu/%lu 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"
@@ -688,7 +688,7 @@ bootalloc(char *name)
 	    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 %ld bytes from %s\n", (long)sb.st_size, buf);
 		return NULL;
 	    }
 	    close(fd);
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 7a674cc..e15f088 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -466,7 +466,7 @@ distSetCustom(dialogMenuItem *self)
 
     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 @@ distUnsetCustom(dialogMenuItem *self)
 
     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)
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 9937b27..4f4c223 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -1035,7 +1035,7 @@ static char *
 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';
diff --git a/usr.sbin/sysinstall/ttys.c b/usr.sbin/sysinstall/ttys.c
index 0b950a8..0de954c 100644
--- a/usr.sbin/sysinstall/ttys.c
+++ b/usr.sbin/sysinstall/ttys.c
@@ -44,7 +44,8 @@
 void
 configTtys(void)
 {
-    int len, t, tlen, changed;
+    size_t len;
+    int t, tlen, changed;
     FILE *fp, *np;
     char sq, *line, *p, *q, *cp, *tptr;
     char templ[sizeof(_PATH_TTYS) + sizeof(_X_EXTENSION) - 1];