diff options
author | 2024-02-25 02:27:26 +1100 | |
---|---|---|
committer | 2024-02-25 02:27:26 +1100 | |
commit | 1615b8551a3a73532ac234973cfb04dd8ed98ba4 (patch) | |
tree | 25575506b4117afa614b94b4370af7f16eb9dbb5 /src/lib/formats/flex_dsk.cpp | |
parent | 334ec12e0043ef939be418283235e3dbe5a005fe (diff) |
util/ioprocs.cpp: Added wrappers for common patterns. (#11608)
emu/diimage.h: Removed fread overloads that allocate memory for output.
util/core_file.cpp: Changed output size of load to size_t.
Diffstat (limited to 'src/lib/formats/flex_dsk.cpp')
-rw-r--r-- | src/lib/formats/flex_dsk.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/formats/flex_dsk.cpp b/src/lib/formats/flex_dsk.cpp index 778e6c990b9..11a72963471 100644 --- a/src/lib/formats/flex_dsk.cpp +++ b/src/lib/formats/flex_dsk.cpp @@ -91,12 +91,11 @@ int flex_format::find_size(util::random_read &io, uint32_t form_factor, const st return -1; uint8_t boot0[256], boot1[256]; - size_t actual; // Look at the boot sector. // Density, sides, link?? - io.read_at(256 * 0, &boot0, sizeof(boot0), actual); - io.read_at(256 * 1, &boot1, sizeof(boot1), actual); + read_at(io, 256 * 0, &boot0, sizeof(boot0)); // FIXME: check for errors and premature EOF + read_at(io, 256 * 1, &boot1, sizeof(boot1)); // FIXME: check for errors and premature EOF LOG_FORMATS("FLEX floppy dsk: size %d bytes, %d total sectors, %d remaining bytes, expected form factor %x\n", (uint32_t)size, (uint32_t)size / 256, (uint32_t)size % 256, form_factor); @@ -129,7 +128,7 @@ int flex_format::find_size(util::random_read &io, uint32_t form_factor, const st if (f.sector_base_size == 128) { // FLEX 1.0: Look at the system information sector. sysinfo_sector_flex10 info; - io.read_at(f.sector_base_size * 2, &info, sizeof(struct sysinfo_sector_flex10), actual); + read_at(io, f.sector_base_size * 2, &info, sizeof(struct sysinfo_sector_flex10)); // FIXME: check for errors and premature EOF LOG_FORMATS("FLEX floppy dsk: size %d bytes, %d total sectors, %d remaining bytes, expected form factor %x\n", (uint32_t)size, (uint32_t)size / f.sector_base_size, (uint32_t)size % f.sector_base_size, form_factor); @@ -142,7 +141,7 @@ int flex_format::find_size(util::random_read &io, uint32_t form_factor, const st } else { // FLEX 2+: Look at the system information sector. sysinfo_sector info; - io.read_at(f.sector_base_size * 2, &info, sizeof(struct sysinfo_sector), actual); + read_at(io, f.sector_base_size * 2, &info, sizeof(struct sysinfo_sector)); // FIXME: check for errors and premature EOF LOG_FORMATS("FLEX floppy dsk: size %d bytes, %d total sectors, %d remaining bytes, expected form factor %x\n", (uint32_t)size, (uint32_t)size / f.sector_base_size, (uint32_t)size % f.sector_base_size, form_factor); |