From aba740a27646fb3d485ff5fd96e166f9b2f4f708 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sat, 6 Dec 2025 19:44:28 +0100 Subject: [PATCH] libcmd: remove unused savedArgv this was only used in the pre-exec daemon days. Change-Id: I3bbb113f9940e6980f01af60e6614a9656b0fd03 --- lix/libcmd/command.hh | 2 -- lix/libmain/shared.cc | 2 -- lix/nix/main.cc | 3 --- 3 files changed, 7 deletions(-) diff --git a/lix/libcmd/command.hh b/lix/libcmd/command.hh index 9b242e159..5c2c64436 100644 --- a/lix/libcmd/command.hh +++ b/lix/libcmd/command.hh @@ -15,8 +15,6 @@ namespace nix { extern std::string programPath; -extern char * * savedArgv; - class EvalState; struct Pos; class Store; diff --git a/lix/libmain/shared.cc b/lix/libmain/shared.cc index 1474b5409..95888a9ca 100644 --- a/lix/libmain/shared.cc +++ b/lix/libmain/shared.cc @@ -33,8 +33,6 @@ namespace nix { -char * * savedArgv; - static bool gcWarning = true; void printGCWarning() diff --git a/lix/nix/main.cc b/lix/nix/main.cc index b8e5a9ef1..ab731b674 100644 --- a/lix/nix/main.cc +++ b/lix/nix/main.cc @@ -455,8 +455,6 @@ void registerNixHelp() int mainWrapped(AsyncIoRoot & aio, int argc, char ** argv) { - savedArgv = argv; - /* The chroot helper needs to be run before any threads have been started. */ if (argc > 0 && argv[0] == chrootHelperName) { @@ -645,7 +643,6 @@ int mainWrapped(AsyncIoRoot & aio, int argc, char ** argv) return 0; } - } int main(int argc, char * * argv)