diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 22:05:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 22:05:59 +0000 |
| commit | fbf745a2c70813a8fca9d5de6574fc602b3ebfeb (patch) | |
| tree | 818185d9363d9193ee54e0d0a442f937804f84bf /base/file_util_posix.cc | |
| parent | 552079df978b40210f549546739b6393fdc3b8b0 (diff) | |
| download | chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.zip chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.tar.gz chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.tar.bz2 | |
file_util: The member variable |pattern_| has a different type (FilePath) from the constructor parameter (StringType).
So fix this type to match with the constructor.
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/465119/show
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/466071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_posix.cc')
| -rw-r--r-- | base/file_util_posix.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index dc9d793..ed5abcc 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -539,11 +539,11 @@ bool SetCurrentDirectory(const FilePath& path) { FileEnumerator::FileEnumerator(const FilePath& root_path, bool recursive, FileEnumerator::FILE_TYPE file_type) - : root_path_(root_path), + : current_directory_entry_(0), + root_path_(root_path), recursive_(recursive), file_type_(file_type), - is_in_find_op_(false), - current_directory_entry_(0) { + is_in_find_op_(false) { // INCLUDE_DOT_DOT must not be specified if recursive. DCHECK(!(recursive && (INCLUDE_DOT_DOT & file_type_))); pending_paths_.push(root_path); @@ -553,19 +553,19 @@ FileEnumerator::FileEnumerator(const FilePath& root_path, bool recursive, FileEnumerator::FILE_TYPE file_type, const FilePath::StringType& pattern) - : root_path_(root_path), + : current_directory_entry_(0), + root_path_(root_path), recursive_(recursive), file_type_(file_type), - pattern_(root_path.Append(pattern)), - is_in_find_op_(false), - current_directory_entry_(0) { + pattern_(root_path.Append(pattern).value()), + is_in_find_op_(false) { // INCLUDE_DOT_DOT must not be specified if recursive. DCHECK(!(recursive && (INCLUDE_DOT_DOT & file_type_))); // The Windows version of this code appends the pattern to the root_path, // potentially only matching against items in the top-most directory. // Do the same here. if (pattern.size() == 0) - pattern_ = FilePath(); + pattern_ = FilePath::StringType(); pending_paths_.push(root_path); } @@ -607,9 +607,8 @@ FilePath FileEnumerator::Next() { if (ShouldSkip(full_path)) continue; - if (pattern_.value().size() && - fnmatch(pattern_.value().c_str(), full_path.value().c_str(), - FNM_NOESCAPE)) + if (pattern_.size() && + fnmatch(pattern_.c_str(), full_path.value().c_str(), FNM_NOESCAPE)) continue; if (recursive_ && S_ISDIR(i->stat.st_mode)) |