daemon: Use inline functions and variables instead of extern

Avoid separate declarations and definitions for so-called 'global' objects.

* nix/libstore/derivations.{cc, hh} (drvHashes): Use inline instead of separate
declaration and definition.
* nix/libstore/globals.{cc, hh} (settings, nixVersion): Same.
* nix/libstore/local-store.hh (drvsLogDir, deduplicationMinSize): Same.
* nix/libstore/optimise-store.cc (deduplicationMinSize): Same.
* nix/libstore/store-api.{cc, hh} (store): Same.
* nix/libutil/archive.{cc, hh} (defaultPathFilter): Same.
* nix/libutil/hash.{cc, hh} (base32Chars): Same and modify header files.
* nix/libutil/util.{cc, hh} (logType, verbosity, _writeToStderr,
_isInterrupted): Same.
* nix/local.mk: Modified according to the rename of shared.hh.
* nix/nix-daemon/guix-daemon.cc (blockInt, argvSaved, run): Same and
modify header files.
* nix/nix-daemon/nix-daemon.cc: Modify header files.
* nix/nix-daemon/shared.hh: Renamed to nix-daemon.hh

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

3 files changed, 13 insertions, 15 deletions

diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index af09839932f..341e39c2907 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -17,12 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
-#include <types.hh>
-#include "shared.hh"
-#include <globals.hh>
-#include <util.hh>
+#include "types.hh"
+#include "nix-daemon.hh"
+#include "globals.hh"
+#include "util.hh"
 
 #include <gcrypt.h>
 
@@ -36,20 +36,13 @@
 #include <netdb.h>
 #include <strings.h>
 #include <exception>
-#include <iostream>
 #include <format>
 
 #include <libintl.h>
 #include <locale.h>
 
-/* Variables used by `nix-daemon.cc'.  */
-volatile ::sig_atomic_t blockInt;
-char **argvSaved;
-
 using namespace nix;
 
-/* Entry point in `nix-daemon.cc'.  */
-extern void run (const std::vector<int> &);
 
 
 /* Command-line options.  */
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index 3890adb2c74..b3cdb699ac2 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "shared.hh"
+#include "nix-daemon.hh"
 #include "local-store.hh"
 #include "util.hh"
 #include "serialise.hh"
diff --git a/nix/nix-daemon/shared.hh b/nix/nix-daemon/nix-daemon.hh
index 98ec97410b7..8791c4f21fd 100644
--- a/nix/nix-daemon/shared.hh
+++ b/nix/nix-daemon/nix-daemon.hh
@@ -20,9 +20,14 @@
 
 #pragma once
 
+#include <vector>
+
 #include <stdlib.h>
 #include <signal.h>
 
-extern volatile ::sig_atomic_t blockInt;
+/* Variables used by `nix-daemon.cc'.  */
+inline volatile ::sig_atomic_t blockInt;
+inline char **argvSaved;
 
-extern char **argvSaved;
+/* Entry point in `nix-daemon.cc'.  */
+void run (const std::vector<int> &);