Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks

3 files changed, 12 insertions, 32 deletions

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index bae6a48837..7a9104cfdb 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -136,20 +136,20 @@ midi_map_filter (const string &str, void* /*arg*/)
 void
 GenericMidiControlProtocol::reload_maps ()
 {
-	vector<string *> *midi_maps;
+	vector<string> midi_maps;
 	PathScanner scanner;
 	Searchpath spath (system_midi_map_search_path());
 	spath += user_midi_map_directory ();
 
 	midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);
 
-	if (!midi_maps) {
+	if (midi_maps.empty()) {
 		cerr << "No MIDI maps found using " << spath.to_string() << endl;
 		return;
 	}
 
-	for (vector<string*>::iterator i = midi_maps->begin(); i != midi_maps->end(); ++i) {
-		string fullpath = *(*i);
+	for (vector<string>::iterator i = midi_maps.begin(); i != midi_maps.end(); ++i) {
+		string fullpath = *i;
 
 		XMLTree tree;
 
@@ -170,8 +170,6 @@ GenericMidiControlProtocol::reload_maps ()
 		
 		map_info.push_back (mi);
 	}
-
-	delete midi_maps;
 }
 	
 void
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)
diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc
index 73e885d8c5..42b70830cb 100644
--- a/libs/surfaces/mackie/device_profile.cc
+++ b/libs/surfaces/mackie/device_profile.cc
@@ -90,25 +90,20 @@ DeviceProfile::reload_device_profiles ()
 {
 	DeviceProfile dp;
 	vector<string> s;
-	vector<string *> *devprofiles;
+	vector<string> devprofiles;
 	PathScanner scanner;
 	Searchpath spath (devprofile_search_path());
 
 	devprofiles = scanner (spath.to_string(), devprofile_filter, 0, false, true);
 	device_profiles.clear ();
 
-	if (!devprofiles) {
+	if (devprofiles.empty()) {
 		error << "No MCP device info files found using " << spath.to_string() << endmsg;
 		return;
 	}
 
-	if (devprofiles->empty()) {
-		error << "No MCP device info files found using " << spath.to_string() << endmsg;
-		return;
-	}
-
-	for (vector<string*>::iterator i = devprofiles->begin(); i != devprofiles->end(); ++i) {
-		string fullpath = *(*i);
+	for (vector<string>::iterator i = devprofiles.begin(); i != devprofiles.end(); ++i) {
+		string fullpath = *i;
 
 		XMLTree tree;
 
@@ -126,9 +121,6 @@ DeviceProfile::reload_device_profiles ()
 			device_profiles[dp.name()] = dp;
 		}
 	}
-
-	vector_delete (devprofiles);
-	delete devprofiles;
 }
 
 int