Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-22 12:28:33 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1157 from npwoods/fileio_strstring

Browse Source 
Changed various string arguments for emu_file::open() from 'const char *' to std::string
This commit is contained in:
Vas Crabb 2016-07-30 11:10:53 +10:00 committed by GitHub
commit 3d6f79ffea
4 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/diimage.cpp
View File

@ -550,7 +550,7 @@ void device_image_interface::battery_load(void *buffer, int length, int fill)
/* try to open the battery file and read it in, if possible */ /* try to open the battery file and read it in, if possible */
emu_file file(device().machine().options().nvram_directory(), OPEN_FLAG_READ); emu_file file(device().machine().options().nvram_directory(), OPEN_FLAG_READ);
filerr = file.open(fname.c_str()); filerr = file.open(fname);
if (filerr == osd_file::error::NONE) if (filerr == osd_file::error::NONE)
bytes_read = file.read(buffer, length); bytes_read = file.read(buffer, length);
@ -568,7 +568,7 @@ void device_image_interface::battery_load(void *buffer, int length, void *def_bu
// try to open the battery file and read it in, if possible // try to open the battery file and read it in, if possible
emu_file file(device().machine().options().nvram_directory(), OPEN_FLAG_READ); emu_file file(device().machine().options().nvram_directory(), OPEN_FLAG_READ);
filerr = file.open(fname.c_str()); filerr = file.open(fname);
if (filerr == osd_file::error::NONE) if (filerr == osd_file::error::NONE)
bytes_read = file.read(buffer, length); bytes_read = file.read(buffer, length);
@ -592,7 +592,7 @@ void device_image_interface::battery_save(const void *buffer, int length)
// try to open the battery file and write it out, if possible // try to open the battery file and write it out, if possible
emu_file file(device().machine().options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); emu_file file(device().machine().options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
osd_file::error filerr = file.open(fname.c_str()); osd_file::error filerr = file.open(fname);
if (filerr == osd_file::error::NONE) if (filerr == osd_file::error::NONE)
file.write(buffer, length); file.write(buffer, length);
} }

36
src/emu/fileio.cpp
View File

@ -110,7 +110,7 @@ const osd::directory::entry *file_enumerator::next()
return nullptr; return nullptr;
// open the path // open the path
m_curdir = osd::directory::open(m_pathbuffer.c_str()); m_curdir = osd::directory::open(m_pathbuffer);
} }
// get the next entry from the current directory // get the next entry from the current directory
@ -240,7 +240,7 @@ util::hash_collection &emu_file::hashes(const char *types)
// open - open a file by searching paths // open - open a file by searching paths
//------------------------------------------------- //-------------------------------------------------
osd_file::error emu_file::open(const char *name) osd_file::error emu_file::open(const std::string &name)
{ {
// remember the filename and CRC info // remember the filename and CRC info
m_filename = name; m_filename = name;
@ -252,28 +252,25 @@ osd_file::error emu_file::open(const char *name)
return open_next(); return open_next();
} }
osd_file::error emu_file::open(const char *name1, const char *name2) osd_file::error emu_file::open(const std::string &name1, const std::string &name2)
{ {
// concatenate the strings and do a standard open // concatenate the strings and do a standard open
std::string name = std::string(name1).append(name2); return open(name1 + name2);
return open(name.c_str());
} }
osd_file::error emu_file::open(const char *name1, const char *name2, const char *name3) osd_file::error emu_file::open(const std::string &name1, const std::string &name2, const std::string &name3)
{ {
// concatenate the strings and do a standard open // concatenate the strings and do a standard open
std::string name = std::string(name1).append(name2).append(name3); return open(name1 + name2 + name3);
return open(name.c_str());
} }
osd_file::error emu_file::open(const char *name1, const char *name2, const char *name3, const char *name4) osd_file::error emu_file::open(const std::string &name1, const std::string &name2, const std::string &name3, const std::string &name4)
{ {
// concatenate the strings and do a standard open // concatenate the strings and do a standard open
std::string name = std::string(name1).append(name2).append(name3).append(name4); return open(name1 + name2 + name3 + name4);
return open(name.c_str());
} }
osd_file::error emu_file::open(const char *name, UINT32 crc) osd_file::error emu_file::open(const std::string &name, UINT32 crc)
{ {
// remember the filename and CRC info // remember the filename and CRC info
m_filename = name; m_filename = name;
@ -285,25 +282,22 @@ osd_file::error emu_file::open(const char *name, UINT32 crc)
return open_next(); return open_next();
} }
osd_file::error emu_file::open(const char *name1, const char *name2, UINT32 crc) osd_file::error emu_file::open(const std::string &name1, const std::string &name2, UINT32 crc)
{ {
// concatenate the strings and do a standard open // concatenate the strings and do a standard open
std::string name = std::string(name1).append(name2); return open(name1 + name2, crc);
return open(name.c_str(), crc);
} }
osd_file::error emu_file::open(const char *name1, const char *name2, const char *name3, UINT32 crc) osd_file::error emu_file::open(const std::string &name1, const std::string &name2, const std::string &name3, UINT32 crc)
{ {
// concatenate the strings and do a standard open // concatenate the strings and do a standard open
std::string name = std::string(name1).append(name2).append(name3); return open(name1 + name2 + name3, crc);
return open(name.c_str(), crc);
} }
osd_file::error emu_file::open(const char *name1, const char *name2, const char *name3, const char *name4, UINT32 crc) osd_file::error emu_file::open(const std::string &name1, const std::string &name2, const std::string &name3, const std::string &name4, UINT32 crc)
{ {
// concatenate the strings and do a standard open // concatenate the strings and do a standard open
std::string name = std::string(name1).append(name2).append(name3).append(name4); return open(name1 + name2 + name3 + name4, crc);
return open(name.c_str(), crc);
} }

16
src/emu/fileio.h
View File

@ -101,14 +101,14 @@ public:
void set_restrict_to_mediapath(bool rtmp = true) { m_restrict_to_mediapath = rtmp; } void set_restrict_to_mediapath(bool rtmp = true) { m_restrict_to_mediapath = rtmp; }
// open/close // open/close
osd_file::error open(const char *name); osd_file::error open(const std::string &name);
osd_file::error open(const char *name1, const char *name2); osd_file::error open(const std::string &name1, const std::string &name2);
osd_file::error open(const char *name1, const char *name2, const char *name3); osd_file::error open(const std::string &name1, const std::string &name2, const std::string &name3);
osd_file::error open(const char *name1, const char *name2, const char *name3, const char *name4); osd_file::error open(const std::string &name1, const std::string &name2, const std::string &name3, const std::string &name4);
osd_file::error open(const char *name, UINT32 crc); osd_file::error open(const std::string &name, UINT32 crc);
osd_file::error open(const char *name1, const char *name2, UINT32 crc); osd_file::error open(const std::string &name1, const std::string &name2, UINT32 crc);
osd_file::error open(const char *name1, const char *name2, const char *name3, UINT32 crc); osd_file::error open(const std::string &name1, const std::string &name2, const std::string &name3, UINT32 crc);
osd_file::error open(const char *name1, const char *name2, const char *name3, const char *name4, UINT32 crc); osd_file::error open(const std::string &name1, const std::string &name2, const std::string &name3, const std::string &name4, UINT32 crc);
osd_file::error open_next(); osd_file::error open_next();
osd_file::error open_ram(const void *data, UINT32 length); osd_file::error open_ram(const void *data, UINT32 length);
void close(); void close();

4
src/emu/romload.cpp
View File

@ -1113,7 +1113,7 @@ chd_error rom_load_manager::open_disk_diff(emu_options &options, const rom_entry
/* try to open the diff */ /* try to open the diff */
LOG(("Opening differencing image file: %s\n", fname.c_str())); LOG(("Opening differencing image file: %s\n", fname.c_str()));
emu_file diff_file(options.diff_directory(), OPEN_FLAG_READ | OPEN_FLAG_WRITE); emu_file diff_file(options.diff_directory(), OPEN_FLAG_READ | OPEN_FLAG_WRITE);
osd_file::error filerr = diff_file.open(fname.c_str()); osd_file::error filerr = diff_file.open(fname);
if (filerr == osd_file::error::NONE) if (filerr == osd_file::error::NONE)
{ {
std::string fullpath(diff_file.fullpath()); std::string fullpath(diff_file.fullpath());
@ -1126,7 +1126,7 @@ chd_error rom_load_manager::open_disk_diff(emu_options &options, const rom_entry
/* didn't work; try creating it instead */ /* didn't work; try creating it instead */
LOG(("Creating differencing image: %s\n", fname.c_str())); LOG(("Creating differencing image: %s\n", fname.c_str()));
diff_file.set_openflags(OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); diff_file.set_openflags(OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
filerr = diff_file.open(fname.c_str()); filerr = diff_file.open(fname);
if (filerr == osd_file::error::NONE) if (filerr == osd_file::error::NONE)
{ {
std::string fullpath(diff_file.fullpath()); std::string fullpath(diff_file.fullpath());