summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/diimage.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-06-24 23:28:42 +0200
committer couriersud <couriersud@arcor.de>2016-06-24 23:28:42 +0200
commit798bb7956756fcb8f356dcaeeaf7fe1e31dab8da (patch)
tree038713be6e2512f886d55a9ac9a9afc92a70d9c8 /src/emu/diimage.cpp
parentbc37304ef96e335810e7dc10367e7e7faa2d3c1d (diff)
parentb3491464e41b6afea81e188fe6a350d4f778854b (diff)
Merge remote-tracking branch 'origin/master' into netlist_dev
Diffstat (limited to 'src/emu/diimage.cpp')
-rw-r--r--src/emu/diimage.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index 9347570fee6..b6c32826a5a 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -295,24 +295,23 @@ void device_image_interface::message(const char *format, ...)
-------------------------------------------------*/
bool device_image_interface::try_change_working_directory(const char *subdir)
{
- osd_directory *directory;
- const osd_directory_entry *entry;
- bool success = FALSE;
- bool done = FALSE;
+ const osd::directory::entry *entry;
+ bool success = false;
+ bool done = false;
- directory = osd_opendir(m_working_directory.c_str());
- if (directory != nullptr)
+ auto directory = osd::directory::open(m_working_directory.c_str());
+ if (directory)
{
- while(!done && (entry = osd_readdir(directory)) != nullptr)
+ while (!done && (entry = directory->read()) != nullptr)
{
if (!core_stricmp(subdir, entry->name))
{
- done = TRUE;
- success = entry->type == ENTTYPE_DIR;
+ done = true;
+ success = entry->type == osd::directory::entry::entry_type::DIR;
}
}
- osd_closedir(directory);
+ directory.reset();
}
/* did we successfully identify the directory? */