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>

6 files changed, 8 insertions, 22 deletions

diff --git a/nix/libutil/archive.cc b/nix/libutil/archive.cc
index fa9f4398e3c..938fe8d4492 100644
--- a/nix/libutil/archive.cc
+++ b/nix/libutil/archive.cc
@@ -24,8 +24,6 @@ static string archiveVersion1 = "nix-archive-1";
 
 static string caseHackSuffix = "~nix~case~hack~";
 
-PathFilter defaultPathFilter;
-
 
 static void dumpContents(const Path & path, size_t size,
     Sink & sink)
diff --git a/nix/libutil/archive.hh b/nix/libutil/archive.hh
index 9b83a5f288f..03716ab469f 100644
--- a/nix/libutil/archive.hh
+++ b/nix/libutil/archive.hh
@@ -50,7 +50,7 @@ struct PathFilter
     virtual bool operator () (const Path & path) { return true; }
 };
 
-extern PathFilter defaultPathFilter;
+inline PathFilter defaultPathFilter;
 
 void dumpPath(const Path & path, Sink & sink,
     PathFilter & filter = defaultPathFilter);
diff --git a/nix/libutil/hash.cc b/nix/libutil/hash.cc
index 57b369d4a9b..ac9eb14514b 100644
--- a/nix/libutil/hash.cc
+++ b/nix/libutil/hash.cc
@@ -103,10 +103,6 @@ unsigned int hashLength32(const Hash & hash)
 }
 
 
-// omitted: E O U T
-const string base32Chars = "0123456789abcdfghijklmnpqrsvwxyz";
-
-
 string printHash32(const Hash & hash)
 {
     Hash hash2(hash);
diff --git a/nix/libutil/hash.hh b/nix/libutil/hash.hh
index 1a6b35f074b..cedb5077c16 100644
--- a/nix/libutil/hash.hh
+++ b/nix/libutil/hash.hh
@@ -2,14 +2,15 @@
 
 #include <gcrypt.h>
 
+#include "archive.hh"
 #include "types.hh"
 #include "serialise.hh"
 
 
 namespace nix {
 
-
-extern const string base32Chars;
+// omitted: E O U T
+inline const string base32Chars {"0123456789abcdfghijklmnpqrsvwxyz"};
 
 typedef enum {
     htUnknown = 0,
@@ -79,8 +80,6 @@ Hash hashFile(HashType ht, const Path & path);
 
 /* Compute the hash of the given path.  The hash is defined as
    (essentially) hashString(ht, dumpPath(path)). */
-struct PathFilter;
-extern PathFilter defaultPathFilter;
 typedef std::pair<Hash, unsigned long long> HashResult;
 HashResult hashPath(HashType ht, const Path & path,
     PathFilter & filter = defaultPathFilter);
diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc
index 22022db51a5..ed1a371dfe1 100644
--- a/nix/libutil/util.cc
+++ b/nix/libutil/util.cc
@@ -600,9 +600,6 @@ void createSymlink(const Path & target, const Path & link)
 }
 
 
-LogType logType = ltPretty;
-Verbosity verbosity = lvlInfo;
-
 static int nestingLevel = 0;
 
 
@@ -691,9 +688,6 @@ void writeToStderr(const string & s)
 }
 
 
-void (*_writeToStderr) (const unsigned char * buf, size_t count) = 0;
-
-
 void readFull(int fd, unsigned char * buf, size_t count)
 {
     while (count) {
@@ -1250,7 +1244,6 @@ void keepOnExec(int fd)
 //////////////////////////////////////////////////////////////////////
 
 
-volatile sig_atomic_t _isInterrupted = 0;
 
 void _interrupted()
 {
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh
index 436c378cb6e..42cb60ea0d4 100644
--- a/nix/libutil/util.hh
+++ b/nix/libutil/util.hh
@@ -132,8 +132,8 @@ typedef enum {
     ltFlat      /* no nesting */
 } LogType;
 
-extern LogType logType;
-extern Verbosity verbosity; /* suppress msgs > this */
+inline LogType logType {ltPretty};
+inline Verbosity verbosity {lvlInfo}; /* suppress msgs > this */
 
 class Nest
 {
@@ -167,7 +167,7 @@ void warnOnce(bool & haveWarned, std::string_view fs);
 
 void writeToStderr(const string & s);
 
-extern void (*_writeToStderr) (const unsigned char * buf, size_t count);
+inline void (*_writeToStderr) (const unsigned char * buf, size_t count) = 0;
 
 
 /* Wrappers arount read()/write() that read/write exactly the
@@ -323,7 +323,7 @@ void commonChildInit(Pipe & logPipe);
 
 /* User interruption. */
 
-extern volatile sig_atomic_t _isInterrupted;
+inline volatile sig_atomic_t _isInterrupted = 0;
 
 void _interrupted();