aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/ssh.cc
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-04-05 21:15:22 +0200
committereldritch horrors <pennae@lix.systems>2024-06-23 11:52:49 +0000
commitce6cb14995e869cfea395570ccb300b0369c72dc (patch)
treeb1fff5058c8996bc7493eba48f1d5aae2b397670 /src/libstore/ssh.cc
parent3d155fc509e19354ba3798b1cc1b9cbcdb789c85 (diff)
libutil: return Pid from startProcess, not pid_t
Change-Id: Icc8a15090c77f54ea7d9220aadedcd4a19922814
Diffstat (limited to 'src/libstore/ssh.cc')
-rw-r--r--src/libstore/ssh.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
index c40eba894..0d7bfa01d 100644
--- a/src/libstore/ssh.cc
+++ b/src/libstore/ssh.cc
@@ -70,7 +70,7 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
}
Finally cleanup = [&]() { logger->resume(); };
- conn->sshPid = Pid{startProcess([&]() {
+ conn->sshPid = startProcess([&]() {
restoreProcessContext();
close(in.writeSide.get());
@@ -99,7 +99,7 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
// could not exec ssh/bash
throw SysError("unable to execute '%s'", args.front());
- }, options)};
+ }, options);
in.readSide.reset();
@@ -147,7 +147,7 @@ Path SSHMaster::startMaster()
if (isMasterRunning())
return state->socketPath;
- state->sshMaster = Pid{startProcess([&]() {
+ state->sshMaster = startProcess([&]() {
restoreProcessContext();
close(out.readSide.get());
@@ -160,7 +160,7 @@ Path SSHMaster::startMaster()
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
throw SysError("unable to execute '%s'", args.front());
- }, options)};
+ }, options);
out.writeSide.reset();