summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/diimage.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
commitcc24a339d8c0517259084b5c178d784626ba965c (patch)
tree9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/diimage.cpp
parentb5daabda5495dea5c50e17961ecfed2ea8619d76 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/diimage.cpp')
-rw-r--r--src/emu/diimage.cpp28
1 files changed, 13 insertions, 15 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index 392da316dbb..6cc9b0fb41a 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -161,29 +161,27 @@ image_error_t device_image_interface::set_image_filename(const char *filename)
zippath_parent(m_working_directory, filename);
m_basename.assign(m_image_name);
- int loc1 = m_image_name.find_last_of('\\');
- int loc2 = m_image_name.find_last_of('/');
- int loc3 = m_image_name.find_last_of(':');
- int loc = MAX(loc1,MAX(loc2,loc3));
- if (loc!=-1) {
+ size_t loc1 = m_image_name.find_last_of('\\');
+ size_t loc2 = m_image_name.find_last_of('/');
+ size_t loc3 = m_image_name.find_last_of(':');
+ size_t loc = MAX(loc1,MAX(loc2, loc3));
+ if (loc != -1) {
if (loc == loc3)
{
// 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);
- std::string tmpstr = std::string(m_basename);
- int tmploc = tmpstr.find_last_of(':');
- m_basename = m_basename.substr(tmploc + 1,loc-tmploc);
+ size_t tmploc = m_basename.find_last_of(':');
+ m_basename = m_basename.substr(tmploc + 1, loc - tmploc);
}
else
- m_basename = m_basename.substr(loc + 1, m_basename.length() - loc);
+ m_basename = m_basename.substr(loc + 1);
}
- m_basename_noext = m_basename.assign(m_basename);
+ m_basename_noext = m_basename;
m_filetype = "";
loc = m_basename_noext.find_last_of('.');
- if (loc!=-1) {
- m_basename_noext = m_basename_noext.substr(0,loc);
- m_filetype = m_basename.assign(m_basename);
- m_filetype = m_filetype.substr(loc + 1, m_filetype.length() - loc);
+ if (loc != -1) {
+ m_basename_noext = m_basename_noext.substr(0, loc);
+ m_filetype = m_basename.substr(loc + 1);
}
return IMAGE_ERROR_SUCCESS;
@@ -1381,7 +1379,7 @@ std::string device_image_interface::software_get_default_slot(const char *defaul
ui_menu *device_image_interface::get_selection_menu(running_machine &machine, render_container *container)
{
- return auto_alloc_clear(machine, <ui_menu_control_device_image>(machine, container, this));
+ return global_alloc_clear<ui_menu_control_device_image>(machine, container, this);
}
/* ----------------------------------------------------------------------- */