aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-02-12 22:19:28 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-02-12 22:19:28 +0300
commit6a971cb441dbeafa9d51af5ee873bf71c843967a (patch)
tree294e3f0c2cd0e536b4c22d5c0b29e5fa9264e0ee
parentec3d77effb6afbed1bfd082e9717b3ce1094ac8f (diff)
Adapt to renaming butl::fdnull() to fdopen_null()
-rw-r--r--bdep/git.txx2
-rw-r--r--bdep/publish.cxx4
-rw-r--r--bdep/utility.cxx4
-rw-r--r--bdep/utility.hxx2
4 files changed, 6 insertions, 6 deletions
diff --git a/bdep/git.txx b/bdep/git.txx
index 822be9e..858c452 100644
--- a/bdep/git.txx
+++ b/bdep/git.txx
@@ -131,7 +131,7 @@ namespace bdep
git_line (const semantic_version& min_ver, bool ie, char delim, A&&... args)
{
fdpipe pipe (open_pipe ());
- auto_fd null (ie ? open_dev_null () : auto_fd ());
+ auto_fd null (ie ? open_null () : auto_fd ());
process pr (start_git (min_ver,
0 /* stdin */,
diff --git a/bdep/publish.cxx b/bdep/publish.cxx
index 094f42c..c97bdd5 100644
--- a/bdep/publish.cxx
+++ b/bdep/publish.cxx
@@ -402,7 +402,7 @@ namespace bdep
auto worktree_add = [&prj, &wd] ()
{
bool q (verb < 2);
- auto_fd null (q ? open_dev_null () : auto_fd ());
+ auto_fd null (q ? open_null () : auto_fd ());
process pr (start_git (git_ver,
prj,
@@ -488,7 +488,7 @@ namespace bdep
{
// Create the empty tree object.
//
- auto_fd null (open_dev_null ());
+ auto_fd null (open_null ());
fdpipe pipe (open_pipe ());
process pr (start_git (git_ver,
diff --git a/bdep/utility.cxx b/bdep/utility.cxx
index 4e3649e..8821790 100644
--- a/bdep/utility.cxx
+++ b/bdep/utility.cxx
@@ -250,11 +250,11 @@ namespace bdep
}
auto_fd
- open_dev_null ()
+ open_null ()
{
try
{
- return fdnull ();
+ return fdopen_null ();
}
catch (const io_error& e)
{
diff --git a/bdep/utility.hxx b/bdep/utility.hxx
index c675951..22be4ee 100644
--- a/bdep/utility.hxx
+++ b/bdep/utility.hxx
@@ -180,7 +180,7 @@ namespace bdep
open_pipe ();
auto_fd
- open_dev_null ();
+ open_null ();
// Run a process.
//