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

---
 bpkg/archive.cxx       | 2 +-
 bpkg/fetch-git.cxx     | 2 +-
 bpkg/pkg-disfigure.cxx | 2 +-
 bpkg/utility.cxx       | 4 ++--
 bpkg/utility.hxx       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx
index 6cce8a2..1471029 100644
--- a/bpkg/archive.cxx
+++ b/bpkg/archive.cxx
@@ -222,7 +222,7 @@ namespace bpkg
 
       // If diag is false, then redirect stderr to stdout.
       //
-      auto_fd nfd (diag ? nullfd : fdnull ());
+      auto_fd nfd (diag ? nullfd : open_null ());
 
       if (i != 0)
       {
diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx
index 80e9fba..bb39cc8 100644
--- a/bpkg/fetch-git.cxx
+++ b/bpkg/fetch-git.cxx
@@ -971,7 +971,7 @@ namespace bpkg
                   const dir_path& dir,
                   const string& commit)
   {
-    auto_fd dev_null (open_dev_null ());
+    auto_fd dev_null (open_null ());
 
     process pr (start_git (co,
                            1,                // The output is suppressed by -e.
diff --git a/bpkg/pkg-disfigure.cxx b/bpkg/pkg-disfigure.cxx
index bee284c..2ddd457 100644
--- a/bpkg/pkg-disfigure.cxx
+++ b/bpkg/pkg-disfigure.cxx
@@ -132,7 +132,7 @@ namespace bpkg
           {
             if (!clean)
             {
-              auto_fd dev_null (open_dev_null ());
+              auto_fd dev_null (open_null ());
 
               // Redirect stderr to /dev/null. Note that we don't expect
               // anything to be written to stdout.
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index 29b0853..5ec8159 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -293,11 +293,11 @@ namespace bpkg
   }
 
   auto_fd
-  open_dev_null ()
+  open_null ()
   {
     try
     {
-      return fdnull ();
+      return fdopen_null ();
     }
     catch (const io_error& e)
     {
diff --git a/bpkg/utility.hxx b/bpkg/utility.hxx
index a8e4a7e..1763af0 100644
--- a/bpkg/utility.hxx
+++ b/bpkg/utility.hxx
@@ -172,7 +172,7 @@ namespace bpkg
   open_pipe ();
 
   auto_fd
-  open_dev_null ();
+  open_null ();
 
   // Directory extracted from argv[0] (i.e., this process' recall directory)
   // or empty if there is none. Can be used as a search fallback.
-- 
cgit v1.1