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

Merge pull request #1133 from npwoods/softlist_stdfind

Browse Source 
Added a usage of std::find_if() in softlist
This commit is contained in:
Vas Crabb 2016-07-23 00:12:43 +10:00 committed by GitHub
commit 5521cc5fc1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/emu/softlist.cpp
View File

@ -519,13 +519,20 @@ const software_info *software_list_device::find(const char *look_for)
bool iswild = strchr(look_for, '*') != nullptr || strchr(look_for, '?');
// find a match (will cause a parse if needed when calling get_info)
for (const software_info &info : get_info())
{
if ((iswild && core_strwildcmp(look_for, info.shortname().c_str()) == 0) || core_stricmp(look_for, info.shortname().c_str()) == 0)
return &info;
}
const auto &info_list = get_info();
auto iter = std::find_if(
info_list.begin(),
info_list.end(),
[&](const software_info &info)
{
const char *shortname = info.shortname().c_str();
return (iswild && core_strwildcmp(look_for, shortname) == 0)
|| core_stricmp(look_for, shortname) == 0;
});
return nullptr;
return iter != info_list.end()
? &*iter
: nullptr;
}