summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/diimage.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/diimage.h')
-rw-r--r--src/emu/diimage.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 900a4410a05..aa9c991c955 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -148,15 +148,13 @@ public:
u32 fread(void *buffer, u32 length)
{
check_for_file();
- size_t actual;
- m_file->read(buffer, length, actual);
+ auto const [err, actual] = read(*m_file, buffer, length);
return actual;
}
u32 fwrite(const void *buffer, u32 length)
{
check_for_file();
- size_t actual;
- m_file->write(buffer, length, actual);
+ auto const [err, actual] = write(*m_file, buffer, length);
return actual;
}
std::error_condition fseek(s64 offset, int whence)
@@ -172,10 +170,6 @@ public:
return result;
}
- // allocate and read into buffers
- u32 fread(std::unique_ptr<u8 []> &ptr, u32 length) { ptr = std::make_unique<u8 []>(length); return fread(ptr.get(), length); }
- u32 fread(std::unique_ptr<u8 []> &ptr, u32 length, offs_t offset) { ptr = std::make_unique<u8 []>(length); return fread(ptr.get() + offset, length - offset); }
-
// access to software list item information
const software_info *software_entry() const noexcept;
const software_part *part_entry() const noexcept { return m_software_part_ptr; }