mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-24 07:51:24 +02:00
refactor, subprocess: Remove Popen::pid()
This commit is contained in:
parent
98dd4e712e
commit
24b53fc84a
@ -902,7 +902,6 @@ private:
|
|||||||
* Command provided in a single string.
|
* Command provided in a single string.
|
||||||
* wait() - Wait for the child to exit.
|
* wait() - Wait for the child to exit.
|
||||||
* retcode() - The return code of the exited child.
|
* retcode() - The return code of the exited child.
|
||||||
* pid() - PID of the spawned child.
|
|
||||||
* poll() - Check the status of the running child.
|
* poll() - Check the status of the running child.
|
||||||
* send(...) - Send input to the input channel of the child.
|
* send(...) - Send input to the input channel of the child.
|
||||||
* communicate(...) - Get the output/error from the child and close the channels
|
* communicate(...) - Get the output/error from the child and close the channels
|
||||||
@ -956,8 +955,6 @@ public:
|
|||||||
execute_process();
|
execute_process();
|
||||||
}
|
}
|
||||||
|
|
||||||
int pid() const noexcept { return child_pid_; }
|
|
||||||
|
|
||||||
int retcode() const noexcept { return retcode_; }
|
int retcode() const noexcept { return retcode_; }
|
||||||
|
|
||||||
int wait() noexcept(false);
|
int wait() noexcept(false);
|
||||||
@ -1068,7 +1065,7 @@ inline int Popen::wait() noexcept(false)
|
|||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
int ret, status;
|
int ret, status;
|
||||||
std::tie(ret, status) = util::wait_for_child_exit(pid());
|
std::tie(ret, status) = util::wait_for_child_exit(child_pid_);
|
||||||
if (ret == -1) {
|
if (ret == -1) {
|
||||||
if (errno != ECHILD) throw OSError("waitpid failed", errno);
|
if (errno != ECHILD) throw OSError("waitpid failed", errno);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user