Silence more warnings.

This commit is contained in:
Murray Stokely 2001-09-22 23:17:37 +00:00
parent d47aa91c6a
commit 250f214507
6 changed files with 10 additions and 9 deletions

View File

@ -98,7 +98,7 @@ print_chunks(Disk *d, int u)
#ifndef PC98 #ifndef PC98
if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) {
dialog_clear_norefresh(); 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" "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" "are unsure as to whether or not it's correct, please consult\n"
"the Hardware Guide in the Documentation submenu or use the\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) { if (read(fd, cp, sb.st_size) != sb.st_size) {
free(cp); free(cp);
close(fd); 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; return NULL;
} }
close(fd); close(fd);

View File

@ -1035,7 +1035,7 @@ static char *
getRelname(void) getRelname(void)
{ {
static char buf[64]; static char buf[64];
int sz = (sizeof buf) - 1; size_t sz = (sizeof buf) - 1;
if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) { if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) {
buf[sz] = '\0'; buf[sz] = '\0';

View File

@ -98,7 +98,7 @@ print_chunks(Disk *d, int u)
#ifndef PC98 #ifndef PC98
if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) {
dialog_clear_norefresh(); 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" "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" "are unsure as to whether or not it's correct, please consult\n"
"the Hardware Guide in the Documentation submenu or use the\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) { if (read(fd, cp, sb.st_size) != sb.st_size) {
free(cp); free(cp);
close(fd); 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; return NULL;
} }
close(fd); close(fd);

View File

@ -466,7 +466,7 @@ distSetCustom(dialogMenuItem *self)
cp = alloca(strlen(tmp) + 1); cp = alloca(strlen(tmp) + 1);
if (!cp) 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); strcpy(cp, tmp);
while (cp) { while (cp) {
if ((cp2 = index(cp, ' ')) != NULL) if ((cp2 = index(cp, ' ')) != NULL)
@ -492,7 +492,7 @@ distUnsetCustom(dialogMenuItem *self)
cp = alloca(strlen(tmp) + 1); cp = alloca(strlen(tmp) + 1);
if (!cp) 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); strcpy(cp, tmp);
while (cp) { while (cp) {
if ((cp2 = index(cp, ' ')) != NULL) if ((cp2 = index(cp, ' ')) != NULL)

View File

@ -1035,7 +1035,7 @@ static char *
getRelname(void) getRelname(void)
{ {
static char buf[64]; static char buf[64];
int sz = (sizeof buf) - 1; size_t sz = (sizeof buf) - 1;
if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) { if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) {
buf[sz] = '\0'; buf[sz] = '\0';

View File

@ -44,7 +44,8 @@
void void
configTtys(void) configTtys(void)
{ {
int len, t, tlen, changed; size_t len;
int t, tlen, changed;
FILE *fp, *np; FILE *fp, *np;
char sq, *line, *p, *q, *cp, *tptr; char sq, *line, *p, *q, *cp, *tptr;
char templ[sizeof(_PATH_TTYS) + sizeof(_X_EXTENSION) - 1]; char templ[sizeof(_PATH_TTYS) + sizeof(_X_EXTENSION) - 1];