dev: Use the correct return type for disk offsets

Replace the use of off_t in the various DiskImage related classes with
std::streampos. off_t is a signed 32 bit integer on most 32-bit
systems, whereas std::streampos is normally a 64 bit integer on most
modern systems. Furthermore, std::streampos is the type used by
tellg() and seekg() in the standard library, so it should have been
used in the first place. This patch makes it possible to use disk
images larger than 2 GiB on 32 bit systems with a modern C++ standard
library.
This commit is contained in:
Andreas Sandberg
2013-02-15 17:40:10 -05:00
parent ca96e7bff1
commit 08467a88a6
3 changed files with 23 additions and 21 deletions

View File

@@ -590,7 +590,7 @@ IdeDisk::startCommand()
switch (cmdReg.command) {
// Supported non-data commands
case WDSF_READ_NATIVE_MAX:
size = image->size() - 1;
size = (uint32_t)image->size() - 1;
cmdReg.sec_num = (size & 0xff);
cmdReg.cyl_low = ((size & 0xff00) >> 8);
cmdReg.cyl_high = ((size & 0xff0000) >> 16);