Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-04 03:46:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

<+cuavas> you've changed the function, you get to change it properly!

Browse Source
This commit is contained in:
Nathan Woods 2016-07-30 09:15:27 -04:00
parent cfd4397f3c
commit eb79ffac88
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/emu/diimage.cpp
View File

@ -190,13 +190,20 @@ void device_image_interface::set_image_filename(const std::string &filename)
util::zippath_parent(m_working_directory, filename); util::zippath_parent(m_working_directory, filename);
m_basename.assign(m_image_name); m_basename.assign(m_image_name);
int loc1 = m_image_name.find_last_of('\\'); // find the last "path separator"
int loc2 = m_image_name.find_last_of('/'); auto iter = std::find_if(
int loc3 = m_image_name.find_last_of(':'); m_image_name.rbegin(),
int loc = MAX(loc1, MAX(loc2, loc3)); m_image_name.rend(),
if (loc != -1) [](char c) { return (c == '\\') || (c == '/') || (c == ':'); });
// get the position
std::string::size_type loc = (iter != m_image_name.rend())
? (&*iter - &m_image_name[0])
: std::string::npos;
if (loc != std::string::npos)
{ {
if (loc == loc3) if (*iter == ':')
{ {
// temp workaround for softlists now that m_image_name contains the part name too (e.g. list:gamename:cart) // temp workaround for softlists now that m_image_name contains the part name too (e.g. list:gamename:cart)
m_basename = m_basename.substr(0, loc); m_basename = m_basename.substr(0, loc);
@ -209,7 +216,7 @@ void device_image_interface::set_image_filename(const std::string &filename)
m_basename_noext = m_basename; m_basename_noext = m_basename;
m_filetype = ""; m_filetype = "";
loc = m_basename_noext.find_last_of('.'); loc = m_basename_noext.find_last_of('.');
if (loc != -1) if (loc != std::string::npos)
{ {
m_basename_noext = m_basename_noext.substr(0, loc); m_basename_noext = m_basename_noext.substr(0, loc);
m_filetype = m_basename.substr(loc + 1); m_filetype = m_basename.substr(loc + 1);
@ -648,38 +655,31 @@ bool device_image_interface::is_loaded()
image_error_t device_image_interface::image_error_from_file_error(osd_file::error filerr) image_error_t device_image_interface::image_error_from_file_error(osd_file::error filerr)
{ {
image_error_t err;
switch (filerr) switch (filerr)
{ {
case osd_file::error::NONE: case osd_file::error::NONE:
err = IMAGE_ERROR_SUCCESS; return IMAGE_ERROR_SUCCESS;
break;
case osd_file::error::NOT_FOUND: case osd_file::error::NOT_FOUND:
case osd_file::error::ACCESS_DENIED: case osd_file::error::ACCESS_DENIED:
// file not found (or otherwise cannot open) // file not found (or otherwise cannot open)
err = IMAGE_ERROR_FILENOTFOUND; return IMAGE_ERROR_FILENOTFOUND;
break;
case osd_file::error::OUT_OF_MEMORY: case osd_file::error::OUT_OF_MEMORY:
// out of memory // out of memory
err = IMAGE_ERROR_OUTOFMEMORY; return IMAGE_ERROR_OUTOFMEMORY;
break;
case osd_file::error::ALREADY_OPEN: case osd_file::error::ALREADY_OPEN:
// this shouldn't happen // this shouldn't happen
err = IMAGE_ERROR_ALREADYOPEN; return IMAGE_ERROR_ALREADYOPEN;
break;
case osd_file::error::FAILURE: case osd_file::error::FAILURE:
case osd_file::error::TOO_MANY_FILES: case osd_file::error::TOO_MANY_FILES:
case osd_file::error::INVALID_DATA: case osd_file::error::INVALID_DATA:
default: default:
// other errors // other errors
err = IMAGE_ERROR_INTERNAL; return IMAGE_ERROR_INTERNAL;
break;
} }
return err;
} }