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/ardour/template_utils.cc | |
| parent | e426c603b679903502989b2b36966e3fb2facd23 (diff) | |
Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks
Diffstat (limited to 'libs/ardour/template_utils.cc')
| -rw-r--r-- | libs/ardour/template_utils.cc | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc index 86881adfc3..20530ca9cc 100644 --- a/libs/ardour/template_utils.cc +++ b/libs/ardour/template_utils.cc @@ -81,21 +81,21 @@ session_template_dir_to_file (string const & dir) void find_session_templates (vector<TemplateInfo>& template_names) { - vector<string *> *templates; + vector<string> templates; PathScanner scanner; Searchpath spath (template_search_path()); templates = scanner (spath.to_string(), template_filter, 0, true, true); - if (!templates) { + if (templates.empty()) { cerr << "Found nothing along " << spath.to_string() << endl; return; } - cerr << "Found " << templates->size() << " along " << spath.to_string() << endl; + cerr << "Found " << templates.size() << " along " << spath.to_string() << endl; - for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) { - string file = session_template_dir_to_file (**i); + for (vector<string>::iterator i = templates.begin(); i != templates.end(); ++i) { + string file = session_template_dir_to_file (*i); XMLTree tree; @@ -105,31 +105,28 @@ find_session_templates (vector<TemplateInfo>& template_names) TemplateInfo rti; - rti.name = basename_nosuffix (**i); - rti.path = **i; + rti.name = basename_nosuffix (*i); + rti.path = *i; template_names.push_back (rti); } - - vector_delete (templates); - delete templates; } void find_route_templates (vector<TemplateInfo>& template_names) { - vector<string *> *templates; + vector<string> templates; PathScanner scanner; Searchpath spath (route_template_search_path()); templates = scanner (spath.to_string(), route_template_filter, 0, false, true); - if (!templates) { + if (templates.empty()) { return; } - for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) { - string fullpath = *(*i); + for (vector<string>::iterator i = templates.begin(); i != templates.end(); ++i) { + string fullpath = *i; XMLTree tree; @@ -146,9 +143,6 @@ find_route_templates (vector<TemplateInfo>& template_names) template_names.push_back (rti); } - - vector_delete (templates); - delete templates; } } |