Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: net/disk_cache/simple/simple_index_file_posix.cc

Issue 1894733002: Change scoped_ptr to std::unique_ptr in //net/disk_cache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/disk_cache/simple/simple_index_file.h" 5 #include "net/disk_cache/simple/simple_index_file.h"
6 6
7 #include <dirent.h> 7 #include <dirent.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include <memory>
12 #include <string> 13 #include <string>
13 14
14 #include "base/logging.h" 15 #include "base/logging.h"
15 #include "base/memory/scoped_ptr.h"
16 16
17 namespace disk_cache { 17 namespace disk_cache {
18 namespace { 18 namespace {
19 19
20 struct DirCloser { 20 struct DirCloser {
21 void operator()(DIR* dir) { closedir(dir); } 21 void operator()(DIR* dir) { closedir(dir); }
22 }; 22 };
23 23
24 typedef scoped_ptr<DIR, DirCloser> ScopedDir; 24 typedef std::unique_ptr<DIR, DirCloser> ScopedDir;
25 25
26 } // namespace 26 } // namespace
27 27
28 // static 28 // static
29 bool SimpleIndexFile::TraverseCacheDirectory( 29 bool SimpleIndexFile::TraverseCacheDirectory(
30 const base::FilePath& cache_path, 30 const base::FilePath& cache_path,
31 const EntryFileCallback& entry_file_callback) { 31 const EntryFileCallback& entry_file_callback) {
32 const ScopedDir dir(opendir(cache_path.value().c_str())); 32 const ScopedDir dir(opendir(cache_path.value().c_str()));
33 if (!dir) { 33 if (!dir) {
34 PLOG(ERROR) << "opendir " << cache_path.value(); 34 PLOG(ERROR) << "opendir " << cache_path.value();
35 return false; 35 return false;
36 } 36 }
37 dirent entry, *result; 37 dirent entry, *result;
38 while (readdir_r(dir.get(), &entry, &result) == 0) { 38 while (readdir_r(dir.get(), &entry, &result) == 0) {
39 if (!result) 39 if (!result)
40 return true; // The traversal completed successfully. 40 return true; // The traversal completed successfully.
41 const std::string file_name(result->d_name); 41 const std::string file_name(result->d_name);
42 if (file_name == "." || file_name == "..") 42 if (file_name == "." || file_name == "..")
43 continue; 43 continue;
44 const base::FilePath file_path = cache_path.Append( 44 const base::FilePath file_path = cache_path.Append(
45 base::FilePath(file_name)); 45 base::FilePath(file_name));
46 entry_file_callback.Run(file_path); 46 entry_file_callback.Run(file_path);
47 } 47 }
48 PLOG(ERROR) << "readdir_r " << cache_path.value(); 48 PLOG(ERROR) << "readdir_r " << cache_path.value();
49 return false; 49 return false;
50 } 50 }
51 51
52 } // namespace disk_cache 52 } // namespace disk_cache
OLDNEW
« no previous file with comments | « net/disk_cache/simple/simple_index_file.cc ('k') | net/disk_cache/simple/simple_index_file_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698