Fixed warnings.

This commit is contained in:
nyan 1999-11-16 11:59:19 +00:00
parent 29d6e6d9a7
commit c4b721b43b
3 changed files with 7 additions and 6 deletions

View File

@ -258,7 +258,7 @@ loadprog(void)
printf("Start address too low\n");
return;
}
printf("text=0x%x ", head.a_text);
printf("text=0x%lx ", head.a_text);
/********************************************************/
/* LOAD THE TEXT SEGMENT */
/********************************************************/
@ -271,7 +271,7 @@ loadprog(void)
while (addr & PAGE_MASK)
*(char *)addr++ = 0;
printf("data=0x%x ", head.a_data);
printf("data=0x%lx ", head.a_data);
xread((void *)addr, head.a_data);
addr += head.a_data;
@ -279,7 +279,7 @@ loadprog(void)
/* Skip over the uninitialised data */
/* (but clear it) */
/********************************************************/
printf("bss=0x%x ", head.a_bss);
printf("bss=0x%lx ", head.a_bss);
/*
* XXX however, we should be checking that we don't load ... into
@ -306,7 +306,7 @@ loadprog(void)
/********************************************************/
/* Load the symbol table */
/********************************************************/
printf("symbols=[+0x%x+0x%x+0x%x", pad, sizeof(head.a_syms),
printf("symbols=[+0x%x+0x%x+0x%lx", pad, sizeof(head.a_syms),
head.a_syms);
xread((void *)addr, head.a_syms);
addr += head.a_syms;

View File

@ -58,8 +58,8 @@
#ifdef DO_BAD144
static struct dkbad dkb;
static int do_bad144;
#endif DO_BAD144
static int bsize;
#endif DO_BAD144
static int spt, spc;

View File

@ -165,11 +165,12 @@ extract_currdev(void)
* (ie. SCSI when IDE also exists).
*/
#ifdef PC98
if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2)) /* biosdev doesn't match major */
if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2)) { /* biosdev doesn't match major */
if (B_TYPE(initial_bootdev) == 6)
biosdev = 0x30 + B_UNIT(initial_bootdev);
else
biosdev = (major << 3) + 0x80 + B_UNIT(initial_bootdev);
}
#else
if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2)) /* biosdev doesn't match major */
biosdev = 0x80 + B_UNIT(initial_bootdev); /* assume harddisk */