X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;fp=pv%2Fdevicemanager.cpp;h=b11e60c7705a3c89f137047d903b164de08521c1;hp=f1f4c542ca227bca236f050f9e226f30c7271422;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=a3f678a7cad210fe796f4a76370996a1284da6d4 diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index f1f4c542..b11e60c7 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -151,10 +151,12 @@ const shared_ptr DeviceManager::find_device_from_info( // If present, vendor and model always have to match. if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0) - if (dev_info.at("vendor") != search_info.at("vendor")) continue; + if (dev_info.at("vendor") != search_info.at("vendor")) + continue; if (dev_info.count("model") > 0 && search_info.count("model") > 0) - if (dev_info.at("model") != search_info.at("model")) continue; + if (dev_info.at("model") != search_info.at("model")) + continue; // Most unique match: vendor/model/serial_num (but don't match a S/N of 0) if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0") @@ -189,7 +191,8 @@ const shared_ptr DeviceManager::find_device_from_info( } bool DeviceManager::compare_devices(shared_ptr a, - shared_ptr b) { + shared_ptr b) +{ assert(a); assert(b); return a->display_name(*this).compare(b->display_name(*this)) < 0;