diff options
author | npwoods <npwoods@mess.org> | 2022-10-16 13:59:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-16 19:59:28 +0200 |
commit | 7ce32ff9440f9fc7a2204047da495a5c27bf186c (patch) | |
tree | 3b7aa626a914225f2e6ee9156cf3d2899514703c /src/emu | |
parent | 2aca0b248447b2c76d798773f99b3ec76781d8d8 (diff) |
Modernize core_strwildcmp() and core_iswildstr() (#10344)
* Modernize core_strwildcmp() and core_iswildstr()
- Changed parameters from 'const char *' to 'std::string_view'
- Removed 16-character limit in core_strwildcmp()
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/emuopts.cpp | 2 | ||||
-rw-r--r-- | src/emu/softlist_dev.cpp | 6 | ||||
-rw-r--r-- | src/emu/softlist_dev.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 827b7249e07..a3972edcb0e 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -1054,7 +1054,7 @@ image_option &emu_options::image_option(const std::string &device_name) void emu_options::command_argument_processed() { // some command line arguments require that the system name be set, so we can get slot options - if (command_arguments().size() == 1 && !core_iswildstr(command_arguments()[0].c_str()) && + if (command_arguments().size() == 1 && !core_iswildstr(command_arguments()[0]) && (command() == "listdevices" || (command() == "listslots") || (command() == "listmedia") || (command() == "listsoftware"))) { set_system_name(command_arguments()[0]); diff --git a/src/emu/softlist_dev.cpp b/src/emu/softlist_dev.cpp index 07ece5ec42f..6db85f917cf 100644 --- a/src/emu/softlist_dev.cpp +++ b/src/emu/softlist_dev.cpp @@ -250,7 +250,7 @@ void software_list_device::display_matches(const machine_config &config, const c // from an intermediate point //------------------------------------------------- -const software_info *software_list_device::find(const std::string &look_for) +const software_info *software_list_device::find(std::string_view look_for) { // empty search returns nothing if (look_for.empty()) @@ -265,8 +265,8 @@ const software_info *software_list_device::find(const std::string &look_for) info_list.end(), [&look_for, iswild] (const software_info &info) { - const char *shortname = info.shortname().c_str(); - return (iswild && core_strwildcmp(look_for.c_str(), shortname) == 0) + std::string_view shortname = info.shortname(); + return (iswild && core_strwildcmp(look_for, shortname) == 0) || util::streqlower(look_for, shortname); }); diff --git a/src/emu/softlist_dev.h b/src/emu/softlist_dev.h index e0e912a67f1..9e919dabe78 100644 --- a/src/emu/softlist_dev.h +++ b/src/emu/softlist_dev.h @@ -121,7 +121,7 @@ public: const std::list<software_info> &get_info() { if (!m_parsed) parse(); return m_infolist; } // operations - const software_info *find(const std::string &look_for); + const software_info *find(std::string_view look_for); void find_approx_matches(std::string_view name, int matches, const software_info **list, const char *interface); void release(); software_compatibility is_compatible(const software_part &part) const; |