mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some format warnings

Browse Source
This commit is contained in:
Volker Ruppert 2014-04-20 12:50:05 +00:00
parent 188dfc2ebe
commit a07bb921e8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/memory/misc_mem.cc
View File

@ -158,12 +158,12 @@ void BX_MEM_C::read_block(Bit32u block)
const Bit64u block_address = ((Bit64u)block)*BX_MEM_BLOCK_LEN;
if (fseeko64(BX_MEM_THIS overflow_file, block_address, SEEK_SET))
BX_PANIC(("FATAL ERROR: Could not seek to 0x%lx in memory overflow file!", block_address));
BX_PANIC(("FATAL ERROR: Could not seek to 0x"FMT_LL"x in memory overflow file!", block_address));
// We could legitimately get an EOF condition if we are reading the last bit of memory.ram
if ((fread(BX_MEM_THIS blocks[block], BX_MEM_BLOCK_LEN, 1, BX_MEM_THIS overflow_file) != 1) &&
(!feof(BX_MEM_THIS overflow_file)))
BX_PANIC(("FATAL ERROR: Could not read from 0x%lx in memory overflow file!", block_address));
BX_PANIC(("FATAL ERROR: Could not read from 0x"FMT_LL"x in memory overflow file!", block_address));
}
#endif

11
bochs/misc/bximage.cc
View File

@ -1234,8 +1234,8 @@ int main(int argc, char *argv[])
Bit64u cyl = (Bit64u)(hdsize/16.0/63.0/512.0);
if (cyl >= (1 << BX_MAX_CYL_BITS))
fatal("ERROR: number of cylinders out of range !\n");
printf("\nCreating hard disk image '%s' with CHS=%ld/%d/%d\n", bx_filename_1,
cyl, heads, spt);
printf("\nCreating hard disk image '%s' with CHS="FMT_LL"d/%d/%d\n",
bx_filename_1, cyl, heads, spt);
hdsize = cyl * heads * spt * 512;
create_hard_disk_image(bx_filename_1, imgmode, hdsize);
}
@ -1300,10 +1300,11 @@ int main(int argc, char *argv[])
} else {
if (hdimage->get_capabilities() & HDIMAGE_AUTO_GEOMETRY) {
Bit64u cyl = (Bit64u)(hdimage->hd_size/16.0/63.0/512.0);
printf("geometry = %ld/16/63 (%ld MB)\n\n", cyl, hdimage->hd_size >> 20);
} else {
printf("geometry = %d/%d/%d (%ld MB)\n\n", hdimage->cylinders, hdimage->heads, hdimage->spt,
printf("geometry = "FMT_LL"d/16/63 ("FMT_LL"d MB)\n\n", cyl,
hdimage->hd_size >> 20);
} else {
printf("geometry = %d/%d/%d ("FMT_LL"d MB)\n\n", hdimage->cylinders,
hdimage->heads, hdimage->spt, hdimage->hd_size >> 20);
}
hdimage->close();
}