summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/chd_cd.cpp
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2021-09-10 09:39:10 -0700
committer Aaron Giles <aaron@aarongiles.com>2021-09-10 09:39:10 -0700
commitfedb40f712d34bb2b6904487ce88dd124e26c7f5 (patch)
tree3a539aa7f386b3c11ec76bdb266ca03a08039cfe /src/devices/imagedev/chd_cd.cpp
parente505ac97bd2de9100d02d37fc0270504bf60b531 (diff)
parenta99d2f3295c21e6ae97cbffce8cf025860bfa4d6 (diff)
Merge branch 'master' into time-experiments2
Diffstat (limited to 'src/devices/imagedev/chd_cd.cpp')
-rw-r--r--src/devices/imagedev/chd_cd.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp
index 5daaba2ed45..4eacb3d3b58 100644
--- a/src/devices/imagedev/chd_cd.cpp
+++ b/src/devices/imagedev/chd_cd.cpp
@@ -83,17 +83,16 @@ void cdrom_image_device::device_stop()
image_init_result cdrom_image_device::call_load()
{
- chd_error err = (chd_error)0;
- chd_file *chd = nullptr;
+ std::error_condition err;
+ chd_file *chd = nullptr;
if (m_cdrom_handle)
cdrom_close(m_cdrom_handle);
- if (!loaded_through_softlist())
- {
+ if (!loaded_through_softlist()) {
if (is_filetype("chd") && is_loaded()) {
- err = m_self_chd.open( image_core_file() ); /* CDs are never writeable */
- if ( err )
+ err = m_self_chd.open(util::core_file_read_write(image_core_file())); // CDs are never writeable
+ if (err)
goto error;
chd = &m_self_chd;
}
@@ -103,20 +102,20 @@ image_init_result cdrom_image_device::call_load()
/* open the CHD file */
if (chd) {
- m_cdrom_handle = cdrom_open( chd );
+ m_cdrom_handle = cdrom_open(chd);
} else {
m_cdrom_handle = cdrom_open(filename());
}
- if ( ! m_cdrom_handle )
+ if (!m_cdrom_handle)
goto error;
return image_init_result::PASS;
error:
- if ( chd && chd == &m_self_chd )
- m_self_chd.close( );
- if ( err )
- seterror( IMAGE_ERROR_UNSPECIFIED, chd_file::error_string( err ) );
+ if (chd && chd == &m_self_chd)
+ m_self_chd.close();
+ if (err)
+ seterror(err, nullptr);
return image_init_result::FAIL;
}