Minor cleanups to device_image_interface::find_software_item()

This commit is contained in:
Nathan Woods 2016-08-20 11:27:37 -04:00
parent e17497b9ee
commit 58e2f401ed

View File

@ -1264,14 +1264,14 @@ const software_part *device_image_interface::find_software_item(const std::strin
return nullptr; return nullptr;
// determine interface // determine interface
const char *interface = nullptr; const char *interface = restrict_to_interface
if (restrict_to_interface) ? image_interface()
interface = image_interface(); : nullptr;
// find the software list if explicitly specified // find the software list if explicitly specified
for (software_list_device &swlistdev : software_list_device_iterator(device().mconfig().root_device())) for (software_list_device &swlistdev : software_list_device_iterator(device().mconfig().root_device()))
{ {
if (list_name.compare(swlistdev.list_name())==0 || !(list_name.length() > 0)) if (list_name.empty() || (list_name == swlistdev.list_name()))
{ {
const software_info *info = swlistdev.find(software_name); const software_info *info = swlistdev.find(software_name);
if (info != nullptr) if (info != nullptr)