From 99e984c8d42d070b83ea27bd10dee8f195b5149b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 12 Feb 2020 22:30:22 +0300
Subject: Adapt to renaming butl::fdnull() to fdopen_null()

---
 bbot/agent/agent.cxx   | 12 +++++++-----
 bbot/agent/machine.cxx |  2 +-
 bbot/utility.hxx       |  4 ++--
 bbot/worker/worker.cxx |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index 80eeae5..2c4e03e 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -93,9 +93,9 @@ inline void
 run_btrfs (tracer& t, A&&... a)
 {
   if (verb >= 4)
-    run_io (t, fdnull (), 2, 2, "btrfs", forward<A> (a)...);
+    run_io (t, fdopen_null (), 2, 2, "btrfs", forward<A> (a)...);
   else
-    run_io (t, fdnull (), fdnull (), 2, "btrfs", forward<A> (a)...);
+    run_io (t, fdopen_null (), fdopen_null (), 2, "btrfs", forward<A> (a)...);
 }
 
 template <typename... A>
@@ -103,8 +103,10 @@ inline butl::process_exit::code_type
 btrfs_exit (tracer& t, A&&... a)
 {
   return verb >= 4
-    ? run_io_exit (t, fdnull (), 2, 2, "btrfs", forward<A> (a)...)
-    : run_io_exit (t, fdnull (), fdnull (), 2, "btrfs", forward<A> (a)...);
+    ? run_io_exit (t, fdopen_null (), 2, 2, "btrfs", forward<A> (a)...)
+    : run_io_exit (t,
+                   fdopen_null (), fdopen_null (), 2,
+                   "btrfs", forward<A> (a)...);
 }
 
 // Bootstrap the machine. Return the bootstrapped machine manifest if
@@ -1194,7 +1196,7 @@ try
       throw_generic_error (ENOENT);
 
     openssl os (trace,
-                ops.auth_key (), path ("-"), fdnull (),
+                ops.auth_key (), path ("-"), fdopen_null (),
                 ops.openssl (), "rsa",
                 ops.openssl_option (), "-pubout", "-outform", "DER");
 
diff --git a/bbot/agent/machine.cxx b/bbot/agent/machine.cxx
index 9b205cc..41d124c 100644
--- a/bbot/agent/machine.cxx
+++ b/bbot/agent/machine.cxx
@@ -36,7 +36,7 @@ namespace bbot
   {
     string addr (iface_addr (br));
 
-    auto_fd fdn (ignore_errors ? fdnull () : nullfd);
+    auto_fd fdn (ignore_errors ? fdopen_null () : nullfd);
     int ofd (ignore_errors ? fdn.get () : 2);
 
     process_exit::code_type e;
diff --git a/bbot/utility.hxx b/bbot/utility.hxx
index ebe9ce8..4545bd3 100644
--- a/bbot/utility.hxx
+++ b/bbot/utility.hxx
@@ -93,7 +93,7 @@ namespace bbot
   inline void
   run (tracer& t, const P& p, A&&... a)
   {
-    run_io (t, butl::fdnull (), 2, 2, p, forward<A> (a)...);
+    run_io (t, butl::fdopen_null (), 2, 2, p, forward<A> (a)...);
   }
 
   template <typename P, typename... A>
@@ -101,7 +101,7 @@ namespace bbot
   run_exit (tracer& t, const P& p, A&&... a)
   {
     return run_io_exit (
-      t, butl::fdnull (), 2, 2, p, forward<A> (a)...);
+      t, butl::fdopen_null (), 2, 2, p, forward<A> (a)...);
   }
 
   // The curl process wrapper (command line tracing, etc).
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index dc19ece..f25a287 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -128,8 +128,8 @@ run_cmd (tracer& t,
 
     process pr (
       process_start_callback (cmdc,
-                              fdnull (), // Never reads from stdin.
-                              2,         // 1>&2
+                              fdopen_null (), // Never reads from stdin.
+                              2,              // 1>&2
                               pipe,
                               pe,
                               forward<A> (a)...));
-- 
cgit v1.1