Skip to content

Commit 0f89cd5

Browse files
committed
Define a callback type for WalkDirectory
Bug: b/491924689
1 parent ce826ae commit 0f89cd5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

base/cvd/cuttlefish/common/libs/utils/files.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,8 @@ Result<std::string> FindFile(const std::string& path,
626626

627627
// Recursively enumerate files in |dir|, and invoke the callback function with
628628
// path to each file/directory.
629-
Result<void> WalkDirectory(
630-
const std::string& dir,
631-
const std::function<Result<void>(const std::string&)>& callback) {
629+
Result<void> WalkDirectory(const std::string& dir,
630+
const WalkDirectoryCallback& callback) {
632631
for (const std::string& filename : CF_EXPECT(DirectoryContents(dir))) {
633632
auto file_path = dir + "/";
634633
file_path.append(filename);

base/cvd/cuttlefish/common/libs/utils/files.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,10 @@ FileSizes SparseFileSizes(const std::string& path);
9999
Result<std::string> FindFile(const std::string& path,
100100
const std::string& target_name);
101101

102-
Result<void> WalkDirectory(
103-
const std::string& dir,
104-
const std::function<Result<void>(const std::string&)>& callback);
102+
using WalkDirectoryCallback = std::function<Result<void>(const std::string&)>;
103+
104+
Result<void> WalkDirectory(const std::string& dir,
105+
const WalkDirectoryCallback& callback);
105106

106107
// parameter to EmulateAbsolutePath
107108
struct InputPathForm {

0 commit comments

Comments
 (0)