From 31333b5b7f8b353d9928a2db6c6d69fa7e071ed6 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 11 Sep 2018 22:28:10 +0300 Subject: [PATCH] Fix warnings. GitOrigin-RevId: 1b76215c3fdfd5a05581ab0122704b4e422de410 --- td/telegram/files/FileStatsWorker.cpp | 40 ++++++++++++++------------- tdutils/test/misc.cpp | 2 +- tdutils/test/port.cpp | 14 ++++++---- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/td/telegram/files/FileStatsWorker.cpp b/td/telegram/files/FileStatsWorker.cpp index 4917ef5b8..81c556b8d 100644 --- a/td/telegram/files/FileStatsWorker.cpp +++ b/td/telegram/files/FileStatsWorker.cpp @@ -98,25 +98,27 @@ Status scan_fs(CallbackT &&callback) { continue; } auto files_dir = get_files_dir(file_type); - td::walk_path(files_dir, [&](CSlice path, bool is_dir) { - if (is_dir) { - // TODO: skip subdirs - return; - } - auto r_stat = stat(path); - if (r_stat.is_error()) { - LOG(WARNING) << "Stat in files gc failed: " << r_stat.error(); - return; - } - auto stat = r_stat.move_as_ok(); - FsFileInfo info; - info.path = path.str(); - info.size = stat.size_; - info.file_type = file_type; - info.atime_nsec = stat.atime_nsec_; - info.mtime_nsec = stat.mtime_nsec_; - callback(info); - }); + td::walk_path(files_dir, + [&](CSlice path, bool is_dir) { + if (is_dir) { + // TODO: skip subdirs + return; + } + auto r_stat = stat(path); + if (r_stat.is_error()) { + LOG(WARNING) << "Stat in files gc failed: " << r_stat.error(); + return; + } + auto stat = r_stat.move_as_ok(); + FsFileInfo info; + info.path = path.str(); + info.size = stat.size_; + info.file_type = file_type; + info.atime_nsec = stat.atime_nsec_; + info.mtime_nsec = stat.mtime_nsec_; + callback(info); + }) + .ignore(); } return Status::OK(); } diff --git a/tdutils/test/misc.cpp b/tdutils/test/misc.cpp index 50525c765..1ac2174e2 100644 --- a/tdutils/test/misc.cpp +++ b/tdutils/test/misc.cpp @@ -438,7 +438,7 @@ TEST(BigNum, from_decimal) { static void test_get_ipv4(uint32 ip) { td::IPAddress ip_address; - ip_address.init_ipv4_port(td::IPAddress::ipv4_to_str(ip), 80); + ip_address.init_ipv4_port(td::IPAddress::ipv4_to_str(ip), 80).ensure(); ASSERT_EQ(ip_address.get_ipv4(), ip); } diff --git a/tdutils/test/port.cpp b/tdutils/test/port.cpp index d4122391f..cd0c2bf54 100644 --- a/tdutils/test/port.cpp +++ b/tdutils/test/port.cpp @@ -29,12 +29,14 @@ TEST(Port, files) { int cnt = 0; const int ITER_COUNT = 1000; for (int i = 0; i < ITER_COUNT; i++) { - walk_path(main_dir, [&](CSlice name, bool is_directory) { - if (!is_directory) { - ASSERT_EQ(fd_path, name); - } - cnt++; - }); + walk_path(main_dir, + [&](CSlice name, bool is_directory) { + if (!is_directory) { + ASSERT_EQ(fd_path, name); + } + cnt++; + }) + .ensure(); } ASSERT_EQ(4 * ITER_COUNT, cnt);