From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 24 Jul 2023 11:51:42 +0000 (+0200)
Subject: refactor: Improve util::read_file usage
X-Git-Tag: v4.9~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2259f22386e88df8da5cac9fa4895869366ffe2;p=thirdparty%2Fccache.git

refactor: Improve util::read_file usage
---

diff --git a/src/storage/remote/FileStorage.cpp b/src/storage/remote/FileStorage.cpp
index ca18dd9f6..da68921b5 100644
--- a/src/storage/remote/FileStorage.cpp
+++ b/src/storage/remote/FileStorage.cpp
@@ -128,12 +128,11 @@ FileStorageBackend::get(const Hash::Digest& key)
     util::set_timestamps(path);
   }
 
-  auto value = util::read_file<util::Bytes>(path);
-  if (!value) {
-    LOG("Failed to read {}: {}", path, value.error());
-    return tl::unexpected(Failure::error);
-  }
-  return std::move(*value);
+  return util::read_file<util::Bytes>(path).transform_error(
+    [&](const auto& error) {
+      LOG("Failed to read {}: {}", path, error);
+      return Failure::error;
+    });
 }
 
 tl::expected<bool, RemoteStorage::Backend::Failure>