From e8bbea1fc6e94e14768509d322f6c624403ffb36 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 22 Aug 2021 09:06:15 +1000 Subject: formats, osd, util: Started refactoring file I/O stuff. (#8456) Added more modern generic I/O interfaces with implementation backed by stdio, osd_file and core_file, replacing io_generic. Also replaced core_file's build-in zlib compression with a filter. unzip.cpp, un7z.cpp: Added option to supply abstract I/O interface rather than filename. Converted osd_file, core_file, archive_file, chd_file and device_image_interface to use std::error_condition rather than their own error enums. Allow mounting TI-99 RPK from inside archives. --- src/mame/drivers/instruct.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mame/drivers/instruct.cpp') diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index 1f14360e37e..fd3f3b9622b 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -356,13 +356,13 @@ QUICKLOAD_LOAD_MEMBER(instruct_state::quickload_cb) quick_length = image.length(); if (quick_length < 0x0100) { - image.seterror(IMAGE_ERROR_INVALIDIMAGE, "File too short"); + image.seterror(image_error::INVALIDIMAGE, "File too short"); image.message(" File too short"); } else if (quick_length > 0x8000) { - image.seterror(IMAGE_ERROR_INVALIDIMAGE, "File too long"); + image.seterror(image_error::INVALIDIMAGE, "File too long"); image.message(" File too long"); } else @@ -371,12 +371,12 @@ QUICKLOAD_LOAD_MEMBER(instruct_state::quickload_cb) read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { - image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); + image.seterror(image_error::INVALIDIMAGE, "Cannot read the file"); image.message(" Cannot read the file"); } else if (quick_data[0] != 0xc5) { - image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Invalid header"); + image.seterror(image_error::INVALIDIMAGE, "Invalid header"); image.message(" Invalid header"); } else @@ -385,7 +385,7 @@ QUICKLOAD_LOAD_MEMBER(instruct_state::quickload_cb) if (exec_addr >= quick_length) { - image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Exec address beyond end of file"); + image.seterror(image_error::INVALIDIMAGE, "Exec address beyond end of file"); image.message(" Exec address beyond end of file"); } else -- cgit v1.2.3-70-g09d2