From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 24 Jul 2023 13:29:37 +0000 (+0200)
Subject: refactor: Improve util::write_fd usage
X-Git-Tag: v4.9~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7403a3d47d3b32aff6daa282bfe275e54e805039;p=thirdparty%2Fccache.git

refactor: Improve util::write_fd usage
---

diff --git a/src/util/file.cpp b/src/util/file.cpp
index 4c739ea1d..afe3bec87 100644
--- a/src/util/file.cpp
+++ b/src/util/file.cpp
@@ -165,11 +165,11 @@ fallocate(int fd, size_t new_size)
   }
   Finalizer buf_freer([&] { free(buf); });
 
-  if (auto result = util::write_fd(fd, buf, bytes_to_write); !result) {
-    return result;
-  }
-  lseek(fd, saved_pos, SEEK_SET);
-  return {};
+  return write_fd(fd, buf, bytes_to_write)
+    .and_then([&]() -> tl::expected<void, std::string> {
+      lseek(fd, saved_pos, SEEK_SET);
+      return {};
+    });
 }
 
 void