forked from lix-project/lix
Shut up clang warnings
This commit is contained in:
parent
3d91bfc8f8
commit
4ba6bc184c
3
local.mk
3
local.mk
|
@ -6,7 +6,8 @@ dist-files += configure config.h.in nix.spec
|
||||||
|
|
||||||
clean-files += Makefile.config
|
clean-files += Makefile.config
|
||||||
|
|
||||||
GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
|
GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr \
|
||||||
|
-Wno-unneeded-internal-declaration
|
||||||
|
|
||||||
$(foreach i, config.h $(call rwildcard, src/lib*, *.hh) src/nix-store/serve-protocol.hh, \
|
$(foreach i, config.h $(call rwildcard, src/lib*, *.hh) src/nix-store/serve-protocol.hh, \
|
||||||
$(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
|
$(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
|
||||||
|
|
|
@ -24,7 +24,9 @@ ifeq ($(perlbindings), yes)
|
||||||
|
|
||||||
Store_CXXFLAGS = \
|
Store_CXXFLAGS = \
|
||||||
-I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \
|
-I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \
|
||||||
-D_FILE_OFFSET_BITS=64 -Wno-unused-variable -Wno-literal-suffix -Wno-reserved-user-defined-literal
|
-D_FILE_OFFSET_BITS=64 \
|
||||||
|
-Wno-unknown-warning-option -Wno-unused-variable -Wno-literal-suffix \
|
||||||
|
-Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion
|
||||||
|
|
||||||
Store_LIBS = libstore libutil
|
Store_LIBS = libstore libutil
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,8 @@ libexpr_DIR := $(d)
|
||||||
|
|
||||||
libexpr_SOURCES := $(wildcard $(d)/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc
|
libexpr_SOURCES := $(wildcard $(d)/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc
|
||||||
|
|
||||||
|
libexpr_CXXFLAGS := -Wno-deprecated-register
|
||||||
|
|
||||||
libexpr_LIBS = libutil libstore libformat
|
libexpr_LIBS = libutil libstore libformat
|
||||||
|
|
||||||
libexpr_LDFLAGS = -ldl
|
libexpr_LDFLAGS = -ldl
|
||||||
|
|
|
@ -88,7 +88,7 @@ extern volatile ::sig_atomic_t blockInt;
|
||||||
|
|
||||||
string showBytes(unsigned long long bytes);
|
string showBytes(unsigned long long bytes);
|
||||||
|
|
||||||
class GCResults;
|
struct GCResults;
|
||||||
|
|
||||||
struct PrintFreed
|
struct PrintFreed
|
||||||
{
|
{
|
||||||
|
|
|
@ -806,7 +806,7 @@ public:
|
||||||
|
|
||||||
void timedOut() override;
|
void timedOut() override;
|
||||||
|
|
||||||
string key()
|
string key() override
|
||||||
{
|
{
|
||||||
/* Ensure that derivations get built in order of their name,
|
/* Ensure that derivations get built in order of their name,
|
||||||
i.e. a derivation named "aardvark" always comes before
|
i.e. a derivation named "aardvark" always comes before
|
||||||
|
@ -815,7 +815,7 @@ public:
|
||||||
return "b$" + storePathToName(drvPath) + "$" + drvPath;
|
return "b$" + storePathToName(drvPath) + "$" + drvPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
void work();
|
void work() override;
|
||||||
|
|
||||||
Path getDrvPath()
|
Path getDrvPath()
|
||||||
{
|
{
|
||||||
|
@ -863,8 +863,8 @@ private:
|
||||||
void deleteTmpDir(bool force);
|
void deleteTmpDir(bool force);
|
||||||
|
|
||||||
/* Callback used by the worker to write to the log. */
|
/* Callback used by the worker to write to the log. */
|
||||||
void handleChildOutput(int fd, const string & data);
|
void handleChildOutput(int fd, const string & data) override;
|
||||||
void handleEOF(int fd);
|
void handleEOF(int fd) override;
|
||||||
|
|
||||||
/* Return the set of (in)valid paths. */
|
/* Return the set of (in)valid paths. */
|
||||||
PathSet checkPathValidity(bool returnValid, bool checkHash);
|
PathSet checkPathValidity(bool returnValid, bool checkHash);
|
||||||
|
|
|
@ -98,41 +98,41 @@ public:
|
||||||
|
|
||||||
/* Implementations of abstract store API methods. */
|
/* Implementations of abstract store API methods. */
|
||||||
|
|
||||||
bool isValidPath(const Path & path);
|
bool isValidPath(const Path & path) override;
|
||||||
|
|
||||||
PathSet queryValidPaths(const PathSet & paths);
|
PathSet queryValidPaths(const PathSet & paths) override;
|
||||||
|
|
||||||
PathSet queryAllValidPaths();
|
PathSet queryAllValidPaths() override;
|
||||||
|
|
||||||
ValidPathInfo queryPathInfo(const Path & path);
|
ValidPathInfo queryPathInfo(const Path & path) override;
|
||||||
|
|
||||||
Hash queryPathHash(const Path & path);
|
Hash queryPathHash(const Path & path) override;
|
||||||
|
|
||||||
void queryReferences(const Path & path, PathSet & references);
|
void queryReferences(const Path & path, PathSet & references) override;
|
||||||
|
|
||||||
void queryReferrers(const Path & path, PathSet & referrers);
|
void queryReferrers(const Path & path, PathSet & referrers) override;
|
||||||
|
|
||||||
Path queryDeriver(const Path & path);
|
Path queryDeriver(const Path & path) override;
|
||||||
|
|
||||||
PathSet queryValidDerivers(const Path & path);
|
PathSet queryValidDerivers(const Path & path) override;
|
||||||
|
|
||||||
PathSet queryDerivationOutputs(const Path & path);
|
PathSet queryDerivationOutputs(const Path & path) override;
|
||||||
|
|
||||||
StringSet queryDerivationOutputNames(const Path & path);
|
StringSet queryDerivationOutputNames(const Path & path) override;
|
||||||
|
|
||||||
Path queryPathFromHashPart(const string & hashPart);
|
Path queryPathFromHashPart(const string & hashPart) override;
|
||||||
|
|
||||||
PathSet querySubstitutablePaths(const PathSet & paths);
|
PathSet querySubstitutablePaths(const PathSet & paths) override;
|
||||||
|
|
||||||
void querySubstitutablePathInfos(const Path & substituter,
|
void querySubstitutablePathInfos(const Path & substituter,
|
||||||
PathSet & paths, SubstitutablePathInfos & infos);
|
PathSet & paths, SubstitutablePathInfos & infos);
|
||||||
|
|
||||||
void querySubstitutablePathInfos(const PathSet & paths,
|
void querySubstitutablePathInfos(const PathSet & paths,
|
||||||
SubstitutablePathInfos & infos);
|
SubstitutablePathInfos & infos) override;
|
||||||
|
|
||||||
Path addToStore(const string & name, const Path & srcPath,
|
Path addToStore(const string & name, const Path & srcPath,
|
||||||
bool recursive = true, HashType hashAlgo = htSHA256,
|
bool recursive = true, HashType hashAlgo = htSHA256,
|
||||||
PathFilter & filter = defaultPathFilter, bool repair = false);
|
PathFilter & filter = defaultPathFilter, bool repair = false) override;
|
||||||
|
|
||||||
/* Like addToStore(), but the contents of the path are contained
|
/* Like addToStore(), but the contents of the path are contained
|
||||||
in `dump', which is either a NAR serialisation (if recursive ==
|
in `dump', which is either a NAR serialisation (if recursive ==
|
||||||
|
@ -142,43 +142,43 @@ public:
|
||||||
bool recursive = true, HashType hashAlgo = htSHA256, bool repair = false);
|
bool recursive = true, HashType hashAlgo = htSHA256, bool repair = false);
|
||||||
|
|
||||||
Path addTextToStore(const string & name, const string & s,
|
Path addTextToStore(const string & name, const string & s,
|
||||||
const PathSet & references, bool repair = false);
|
const PathSet & references, bool repair = false) override;
|
||||||
|
|
||||||
void exportPath(const Path & path, bool sign,
|
void exportPath(const Path & path, bool sign,
|
||||||
Sink & sink);
|
Sink & sink) override;
|
||||||
|
|
||||||
Paths importPaths(bool requireSignature, Source & source);
|
Paths importPaths(bool requireSignature, Source & source) override;
|
||||||
|
|
||||||
void buildPaths(const PathSet & paths, BuildMode buildMode);
|
void buildPaths(const PathSet & paths, BuildMode buildMode) override;
|
||||||
|
|
||||||
BuildResult buildDerivation(const Path & drvPath, const BasicDerivation & drv,
|
BuildResult buildDerivation(const Path & drvPath, const BasicDerivation & drv,
|
||||||
BuildMode buildMode) override;
|
BuildMode buildMode) override;
|
||||||
|
|
||||||
void ensurePath(const Path & path);
|
void ensurePath(const Path & path) override;
|
||||||
|
|
||||||
void addTempRoot(const Path & path);
|
void addTempRoot(const Path & path) override;
|
||||||
|
|
||||||
void addIndirectRoot(const Path & path);
|
void addIndirectRoot(const Path & path) override;
|
||||||
|
|
||||||
void syncWithGC();
|
void syncWithGC() override;
|
||||||
|
|
||||||
Roots findRoots();
|
Roots findRoots() override;
|
||||||
|
|
||||||
void collectGarbage(const GCOptions & options, GCResults & results);
|
void collectGarbage(const GCOptions & options, GCResults & results) override;
|
||||||
|
|
||||||
/* Optimise the disk space usage of the Nix store by hard-linking
|
/* Optimise the disk space usage of the Nix store by hard-linking
|
||||||
files with the same contents. */
|
files with the same contents. */
|
||||||
void optimiseStore(OptimiseStats & stats);
|
void optimiseStore(OptimiseStats & stats);
|
||||||
|
|
||||||
/* Generic variant of the above method. */
|
/* Generic variant of the above method. */
|
||||||
void optimiseStore();
|
void optimiseStore() override;
|
||||||
|
|
||||||
/* Optimise a single store path. */
|
/* Optimise a single store path. */
|
||||||
void optimisePath(const Path & path);
|
void optimisePath(const Path & path);
|
||||||
|
|
||||||
/* Check the integrity of the Nix store. Returns true if errors
|
/* Check the integrity of the Nix store. Returns true if errors
|
||||||
remain. */
|
remain. */
|
||||||
bool verifyStore(bool checkContents, bool repair);
|
bool verifyStore(bool checkContents, bool repair) override;
|
||||||
|
|
||||||
/* Register the validity of a path, i.e., that `path' exists, that
|
/* Register the validity of a path, i.e., that `path' exists, that
|
||||||
the paths referenced by it exists, and in the case of an output
|
the paths referenced by it exists, and in the case of an output
|
||||||
|
@ -197,9 +197,9 @@ public:
|
||||||
/* Query whether `path' previously failed to build. */
|
/* Query whether `path' previously failed to build. */
|
||||||
bool hasPathFailed(const Path & path);
|
bool hasPathFailed(const Path & path);
|
||||||
|
|
||||||
PathSet queryFailedPaths();
|
PathSet queryFailedPaths() override;
|
||||||
|
|
||||||
void clearFailedPaths(const PathSet & paths);
|
void clearFailedPaths(const PathSet & paths) override;
|
||||||
|
|
||||||
void vacuumDB();
|
void vacuumDB();
|
||||||
|
|
||||||
|
|
|
@ -24,71 +24,72 @@ public:
|
||||||
|
|
||||||
/* Implementations of abstract store API methods. */
|
/* Implementations of abstract store API methods. */
|
||||||
|
|
||||||
bool isValidPath(const Path & path);
|
bool isValidPath(const Path & path) override;
|
||||||
|
|
||||||
PathSet queryValidPaths(const PathSet & paths);
|
PathSet queryValidPaths(const PathSet & paths) override;
|
||||||
|
|
||||||
PathSet queryAllValidPaths();
|
PathSet queryAllValidPaths() override;
|
||||||
|
|
||||||
ValidPathInfo queryPathInfo(const Path & path);
|
ValidPathInfo queryPathInfo(const Path & path) override;
|
||||||
|
|
||||||
Hash queryPathHash(const Path & path);
|
Hash queryPathHash(const Path & path) override;
|
||||||
|
|
||||||
void queryReferences(const Path & path, PathSet & references);
|
void queryReferences(const Path & path, PathSet & references) override;
|
||||||
|
|
||||||
void queryReferrers(const Path & path, PathSet & referrers);
|
void queryReferrers(const Path & path, PathSet & referrers) override;
|
||||||
|
|
||||||
Path queryDeriver(const Path & path);
|
Path queryDeriver(const Path & path) override;
|
||||||
|
|
||||||
PathSet queryValidDerivers(const Path & path);
|
PathSet queryValidDerivers(const Path & path) override;
|
||||||
|
|
||||||
PathSet queryDerivationOutputs(const Path & path);
|
PathSet queryDerivationOutputs(const Path & path) override;
|
||||||
|
|
||||||
StringSet queryDerivationOutputNames(const Path & path);
|
StringSet queryDerivationOutputNames(const Path & path) override;
|
||||||
|
|
||||||
Path queryPathFromHashPart(const string & hashPart);
|
Path queryPathFromHashPart(const string & hashPart) override;
|
||||||
|
|
||||||
PathSet querySubstitutablePaths(const PathSet & paths);
|
PathSet querySubstitutablePaths(const PathSet & paths) override;
|
||||||
|
|
||||||
void querySubstitutablePathInfos(const PathSet & paths,
|
void querySubstitutablePathInfos(const PathSet & paths,
|
||||||
SubstitutablePathInfos & infos);
|
SubstitutablePathInfos & infos) override;
|
||||||
|
|
||||||
Path addToStore(const string & name, const Path & srcPath,
|
Path addToStore(const string & name, const Path & srcPath,
|
||||||
bool recursive = true, HashType hashAlgo = htSHA256,
|
bool recursive = true, HashType hashAlgo = htSHA256,
|
||||||
PathFilter & filter = defaultPathFilter, bool repair = false);
|
PathFilter & filter = defaultPathFilter, bool repair = false) override;
|
||||||
|
|
||||||
Path addTextToStore(const string & name, const string & s,
|
Path addTextToStore(const string & name, const string & s,
|
||||||
const PathSet & references, bool repair = false);
|
const PathSet & references, bool repair = false) override;
|
||||||
|
|
||||||
void exportPath(const Path & path, bool sign,
|
void exportPath(const Path & path, bool sign,
|
||||||
Sink & sink);
|
Sink & sink) override;
|
||||||
|
|
||||||
Paths importPaths(bool requireSignature, Source & source);
|
Paths importPaths(bool requireSignature, Source & source) override;
|
||||||
|
|
||||||
void buildPaths(const PathSet & paths, BuildMode buildMode);
|
void buildPaths(const PathSet & paths, BuildMode buildMode) override;
|
||||||
|
|
||||||
BuildResult buildDerivation(const Path & drvPath, const BasicDerivation & drv,
|
BuildResult buildDerivation(const Path & drvPath, const BasicDerivation & drv,
|
||||||
BuildMode buildMode) override;
|
BuildMode buildMode) override;
|
||||||
|
|
||||||
void ensurePath(const Path & path);
|
void ensurePath(const Path & path) override;
|
||||||
|
|
||||||
void addTempRoot(const Path & path);
|
void addTempRoot(const Path & path) override;
|
||||||
|
|
||||||
void addIndirectRoot(const Path & path);
|
void addIndirectRoot(const Path & path) override;
|
||||||
|
|
||||||
void syncWithGC();
|
void syncWithGC() override;
|
||||||
|
|
||||||
Roots findRoots();
|
Roots findRoots() override;
|
||||||
|
|
||||||
void collectGarbage(const GCOptions & options, GCResults & results);
|
void collectGarbage(const GCOptions & options, GCResults & results) override;
|
||||||
|
|
||||||
PathSet queryFailedPaths();
|
PathSet queryFailedPaths() override;
|
||||||
|
|
||||||
void clearFailedPaths(const PathSet & paths);
|
void clearFailedPaths(const PathSet & paths) override;
|
||||||
|
|
||||||
void optimiseStore();
|
void optimiseStore() override;
|
||||||
|
|
||||||
|
bool verifyStore(bool checkContents, bool repair) override;
|
||||||
|
|
||||||
bool verifyStore(bool checkContents, bool repair);
|
|
||||||
private:
|
private:
|
||||||
AutoCloseFD fdSocket;
|
AutoCloseFD fdSocket;
|
||||||
FdSink to;
|
FdSink to;
|
||||||
|
|
|
@ -115,7 +115,6 @@ const string base32Chars = "0123456789abcdfghijklmnpqrsvwxyz";
|
||||||
|
|
||||||
string printHash32(const Hash & hash)
|
string printHash32(const Hash & hash)
|
||||||
{
|
{
|
||||||
Hash hash2(hash);
|
|
||||||
unsigned int len = hashLength32(hash);
|
unsigned int len = hashLength32(hash);
|
||||||
|
|
||||||
string s;
|
string s;
|
||||||
|
|
|
@ -1277,7 +1277,7 @@ static void opDeleteGenerations(Globals & globals, Strings opFlags, Strings opAr
|
||||||
std::set<unsigned int> gens;
|
std::set<unsigned int> gens;
|
||||||
for (auto & i : opArgs) {
|
for (auto & i : opArgs) {
|
||||||
unsigned int n;
|
unsigned int n;
|
||||||
if (!string2Int(i, n) || n < 0)
|
if (!string2Int(i, n))
|
||||||
throw UsageError(format("invalid generation number ‘%1%’") % i);
|
throw UsageError(format("invalid generation number ‘%1%’") % i);
|
||||||
gens.insert(n);
|
gens.insert(n);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue