smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 07:06:23 +01:00
Code Issues Projects Releases Wiki Activity

Remove PathScanner::run_scan and use PathScanner::run_scan_internal directly

Browse source
This commit is contained in:
Tim Mayberry 2014-06-17 11:22:52 +10:00 • committed by Paul Davis
parent e5d4a16594
commit 51fbb8a352
2 changed files with 10 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libs/pbd/pathscanner.cc
View file

@ -78,11 +78,9 @@ PathScanner::find_files_matching_regex (vector<string>& result,
return; return;
} }
result = run_scan (dirpath, run_scan_internal (result, dirpath,
regexp_filter, regexp_filter, &compiled_pattern,
&compiled_pattern, match_fullpath, return_fullpath,
match_fullpath,
return_fullpath,
limit, recurse); limit, recurse);
regfree (&compiled_pattern); regfree (&compiled_pattern);
@ -106,19 +104,6 @@ PathScanner::operator() (const string &dirpath, const string &regexp,
return result; return result;
} }
vector<string>
PathScanner::run_scan (const string &dirpath,
bool (*filter)(const string &, void *),
void *arg,
bool match_fullpath, bool return_fullpath,
long limit,
bool recurse)
{
vector<string> result;
run_scan_internal (result, dirpath, filter, arg, match_fullpath, return_fullpath, limit, recurse);
return result;
}
void void
PathScanner::run_scan_internal (vector<string>& result, PathScanner::run_scan_internal (vector<string>& result,
const string &dirpath, const string &dirpath,

18
libs/pbd/pbd/pathscanner.h
View file

@ -41,12 +41,12 @@ class LIBPBD_API PathScanner
bool return_fullpath = true, bool return_fullpath = true,
long limit = -1, long limit = -1,
bool recurse = false) { bool recurse = false) {
return run_scan (dirpath, std::vector<std::string> result;
filter, run_scan_internal (result, dirpath,
arg, filter, arg,
match_fullpath, match_fullpath, return_fullpath,
return_fullpath,
limit, recurse); limit, recurse);
return result;
} }
std::vector<std::string> operator() (const std::string &dirpath, std::vector<std::string> operator() (const std::string &dirpath,
@ -77,14 +77,6 @@ class LIBPBD_API PathScanner
long limit, long limit,
bool recurse = false); bool recurse = false);
std::vector<std::string> run_scan (const std::string &dirpath,
bool (*filter)(const std::string &, void *),
void *arg,
bool match_fullpath,
bool return_fullpath,
long limit,
bool recurse = false);
void run_scan_internal (std::vector<std::string>&, void run_scan_internal (std::vector<std::string>&,
const std::string &dirpath, const std::string &dirpath,
bool (*filter)(const std::string &, void *), bool (*filter)(const std::string &, void *),