diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-16 20:39:45 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2014-06-17 21:13:05 +1000 |
| commit | 0e96d84079c1792523d99b6bbec5878d11f5c8e4 (patch) | |
| tree | b4faae743beff6136031953c12b3858d6b44cea8 /libs/surfaces/mackie/device_info.cc | |
| parent | e426c603b679903502989b2b36966e3fb2facd23 (diff) | |
Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks
Diffstat (limited to 'libs/surfaces/mackie/device_info.cc')
| -rw-r--r-- | libs/surfaces/mackie/device_info.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index a2aeaa08aa..672bb25511 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -471,31 +471,24 @@ DeviceInfo::reload_device_info () { DeviceInfo di; vector<string> s; - vector<string *> *devinfos; + vector<string> devinfos; PathScanner scanner; Searchpath spath (devinfo_search_path()); devinfos = scanner (spath.to_string(), devinfo_filter, 0, false, true); device_info.clear (); - if (!devinfos) { + if (devinfos.empty()) { error << "No MCP device info files found using " << spath.to_string() << endmsg; std::cerr << "No MCP device info files found using " << spath.to_string() << std::endl; return; } - if (devinfos->empty()) { - error << "No MCP device info files found using " << spath.to_string() << endmsg; - std::cerr << "No MCP device info files found using " << spath.to_string() << std::endl; - return; - } - - for (vector<string*>::iterator i = devinfos->begin(); i != devinfos->end(); ++i) { - string fullpath = *(*i); + for (vector<string>::iterator i = devinfos.begin(); i != devinfos.end(); ++i) { + string fullpath = *i; XMLTree tree; - if (!tree.read (fullpath.c_str())) { continue; } @@ -509,9 +502,6 @@ DeviceInfo::reload_device_info () device_info[di.name()] = di; } } - - vector_delete (devinfos); - delete devinfos; } std::ostream& operator<< (std::ostream& os, const Mackie::DeviceInfo& di) |