aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-02-12 21:49:26 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-02-12 21:49:26 +0300
commitd607470c3ce28c13ec3f55971803752446ff7387 (patch)
tree3c07240a5f201e6ce5af78bc0ef1b6a5dda00c23
parent0b95ca508ed4d664721f41dccda6b49e87941d00 (diff)
Adapt to renaming butl::fdnull() to fdopen_null()
-rw-r--r--libbuild2/test/script/runner.cxx4
-rw-r--r--libbuild2/utility.cxx4
-rw-r--r--libbuild2/utility.hxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/libbuild2/test/script/runner.cxx b/libbuild2/test/script/runner.cxx
index b006f3e..3d03bd8 100644
--- a/libbuild2/test/script/runner.cxx
+++ b/libbuild2/test/script/runner.cxx
@@ -1352,7 +1352,7 @@ namespace build2
//
case redirect_type::null:
{
- ifd = open_dev_null ();
+ ifd = open_null ();
break;
}
@@ -1455,7 +1455,7 @@ namespace build2
}
}
- case redirect_type::null: return open_dev_null ();
+ case redirect_type::null: return open_null ();
// Duplicate the paired file descriptor later.
//
diff --git a/libbuild2/utility.cxx b/libbuild2/utility.cxx
index faffd66..3b4b94f 100644
--- a/libbuild2/utility.cxx
+++ b/libbuild2/utility.cxx
@@ -327,11 +327,11 @@ namespace build2
}
auto_fd
- open_dev_null ()
+ open_null ()
{
try
{
- return fdnull ();
+ return fdopen_null ();
}
catch (const io_error& e)
{
diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx
index dd4b78b..3a5e708 100644
--- a/libbuild2/utility.hxx
+++ b/libbuild2/utility.hxx
@@ -522,7 +522,7 @@ namespace build2
open_pipe ();
auto_fd
- open_dev_null ();
+ open_null ();
// Empty/nullopt string, path, and project name.
//