C++-ify {copy,write}_fd

1 files changed, 6 insertions, 4 deletions

diff --git a/src/ResultExtractor.cpp b/src/ResultExtractor.cpp
index 61349b05..531f0b4c 100644
--- a/src/ResultExtractor.cpp
+++ b/src/ResultExtractor.cpp
@@ -18,8 +18,7 @@
 
 #include "ResultExtractor.hpp"
 
-#include "Context.hpp"
-#include "logging.hpp"
+#include "Util.hpp"
 
 #include "third_party/nonstd/string_view.hpp"
 
@@ -73,8 +72,11 @@ ResultExtractor::on_entry_data(const uint8_t* data, size_t size)
 {
   assert(m_dest_fd);
 
-  if (!write_fd(*m_dest_fd, data, size)) {
-    throw Error(fmt::format("Failed to write to {}", m_dest_path));
+  try {
+    Util::write_fd(*m_dest_fd, data, size);
+  } catch (Error& e) {
+    throw Error(
+      fmt::format("Failed to write to {}: {}", m_dest_path, e.what()));
   }
 }