From af4d064be7fa6491ae434f1e68c4285f83a39566 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sun, 3 May 2026 16:32:26 +0200 Subject: [PATCH] libstore: processConnection -> processLegacyConnection Change-Id: I608085c845cce05f4186f83b9ef0d84e8e4a776e --- lix/libstore/daemon.cc | 9 +++------ lix/libstore/daemon.hh | 10 +++------- lix/nix/daemon.cc | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/lix/libstore/daemon.cc b/lix/libstore/daemon.cc index e129f552e..6c4d6974b 100644 --- a/lix/libstore/daemon.cc +++ b/lix/libstore/daemon.cc @@ -857,12 +857,9 @@ static void performOp(AsyncIoRoot & aio, TunnelLogger * logger, ref store } } -void processConnection( - AsyncIoRoot & aio, - ref store, - FdSource & from, - FdSink & to, - TrustedFlag trusted) +void processLegacyConnection( + AsyncIoRoot & aio, ref store, FdSource & from, FdSink & to, TrustedFlag trusted +) { auto monitor = std::make_unique(from.fd); diff --git a/lix/libstore/daemon.hh b/lix/libstore/daemon.hh index 6b8b8eb45..31d3f1314 100644 --- a/lix/libstore/daemon.hh +++ b/lix/libstore/daemon.hh @@ -7,11 +7,7 @@ namespace nix::daemon { -void processConnection( - AsyncIoRoot & aio, - ref store, - FdSource & from, - FdSink & to, - TrustedFlag trusted); - +void processLegacyConnection( + AsyncIoRoot & aio, ref store, FdSource & from, FdSink & to, TrustedFlag trusted +); } diff --git a/lix/nix/daemon.cc b/lix/nix/daemon.cc index 0a4542c89..bba0b09fb 100644 --- a/lix/nix/daemon.cc +++ b/lix/nix/daemon.cc @@ -530,7 +530,7 @@ static void daemonInstance( case daemon::Protocol::LEGACY: { FdSource from(connectionFd); FdSink to(connectionFd); - processConnection(aio, store, from, to, trusted); + processLegacyConnection(aio, store, from, to, trusted); break; } } @@ -578,7 +578,7 @@ processStdioConnection(AsyncIoRoot & aio, ref store, TrustedFlag trustCli { FdSource from(STDIN_FILENO); FdSink to(STDOUT_FILENO); - processConnection(aio, store, from, to, trustClient); + processLegacyConnection(aio, store, from, to, trustClient); } /**