From d607470c3ce28c13ec3f55971803752446ff7387 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 12 Feb 2020 21:49:26 +0300 Subject: Adapt to renaming butl::fdnull() to fdopen_null() --- libbuild2/test/script/runner.cxx | 4 ++-- libbuild2/utility.cxx | 4 ++-- libbuild2/utility.hxx | 2 +- 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. // -- cgit v1.1