fix(3p/nix): revert "apply all clang-tidy fixes"
This reverts commit ef54f5da9f.
Resolved conflicts:
third_party/nix/src/libexpr/eval.cc
third_party/nix/src/libstore/builtins/fetchurl.cc
third_party/nix/src/libstore/references.cc
third_party/nix/src/libutil/hash.cc
third_party/nix/src/nix-daemon/nix-daemon.cc
Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Kane York
kanepyork
parent
cc3c45f739
commit
72fc2fd27e
64 changed files with 479 additions and 555 deletions
56
third_party/nix/src/nix-daemon/nix-daemon.cc
vendored
56
third_party/nix/src/nix-daemon/nix-daemon.cc
vendored
|
|
@ -183,7 +183,7 @@ struct RetrieveRegularNARSink : ParseSink {
|
|||
void createDirectory(const Path& path) override { regular = false; }
|
||||
|
||||
void receiveContents(unsigned char* data, unsigned int len) override {
|
||||
s.append(reinterpret_cast<const char*>(data), len);
|
||||
s.append((const char*)data, len);
|
||||
}
|
||||
|
||||
void createSymlink(const Path& path, const std::string& target) override {
|
||||
|
|
@ -296,8 +296,8 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
}
|
||||
|
||||
case wopAddToStore: {
|
||||
bool fixed = 0;
|
||||
bool recursive = 0;
|
||||
bool fixed = false;
|
||||
bool recursive = false;
|
||||
std::string hashType;
|
||||
std::string baseName;
|
||||
from >> baseName >> fixed /* obsolete */ >> recursive >> hashType;
|
||||
|
|
@ -376,7 +376,7 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
auto drvs = readStorePaths<PathSet>(*store, from);
|
||||
BuildMode mode = bmNormal;
|
||||
if (GET_PROTOCOL_MINOR(clientVersion) >= 15) {
|
||||
mode = static_cast<BuildMode>(readInt(from));
|
||||
mode = (BuildMode)readInt(from);
|
||||
|
||||
/* Repairing is not atomic, so disallowed for "untrusted"
|
||||
clients. */
|
||||
|
|
@ -397,7 +397,7 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
Path drvPath = readStorePath(*store, from);
|
||||
BasicDerivation drv;
|
||||
readDerivation(from, *store, drv);
|
||||
auto buildMode = static_cast<BuildMode>(readInt(from));
|
||||
auto buildMode = (BuildMode)readInt(from);
|
||||
logger->startWork();
|
||||
if (!trusted) {
|
||||
throw Error("you are not privileged to build derivations");
|
||||
|
|
@ -466,7 +466,7 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
|
||||
case wopCollectGarbage: {
|
||||
GCOptions options;
|
||||
options.action = static_cast<GCOptions::GCAction>(readInt(from));
|
||||
options.action = (GCOptions::GCAction)readInt(from);
|
||||
options.pathsToDelete = readStorePaths<PathSet>(*store, from);
|
||||
from >> options.ignoreLiveness >> options.maxFreed;
|
||||
// obsolete fields
|
||||
|
|
@ -639,15 +639,14 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
}
|
||||
|
||||
case wopVerifyStore: {
|
||||
bool checkContents = 0;
|
||||
bool repair = 0;
|
||||
bool checkContents;
|
||||
bool repair;
|
||||
from >> checkContents >> repair;
|
||||
logger->startWork();
|
||||
if (repair && !trusted) {
|
||||
throw Error("you are not privileged to repair paths");
|
||||
}
|
||||
bool errors =
|
||||
store->verifyStore(checkContents, static_cast<RepairFlag>(repair));
|
||||
bool errors = store->verifyStore(checkContents, (RepairFlag)repair);
|
||||
logger->stopWork();
|
||||
to << static_cast<uint64_t>(errors);
|
||||
break;
|
||||
|
|
@ -675,8 +674,8 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
}
|
||||
|
||||
case wopAddToStoreNar: {
|
||||
bool repair = 0;
|
||||
bool dontCheckSigs = 0;
|
||||
bool repair;
|
||||
bool dontCheckSigs;
|
||||
ValidPathInfo info;
|
||||
info.path = readStorePath(*store, from);
|
||||
from >> info.deriver;
|
||||
|
|
@ -709,7 +708,7 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
logger->startWork();
|
||||
|
||||
// FIXME: race if addToStore doesn't read source?
|
||||
store->addToStore(info, *source, static_cast<RepairFlag>(repair),
|
||||
store->addToStore(info, *source, (RepairFlag)repair,
|
||||
dontCheckSigs ? NoCheckSigs : CheckSigs, nullptr);
|
||||
|
||||
logger->stopWork();
|
||||
|
|
@ -722,8 +721,8 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store,
|
|||
PathSet willBuild;
|
||||
PathSet willSubstitute;
|
||||
PathSet unknown;
|
||||
unsigned long long downloadSize = 0;
|
||||
unsigned long long narSize = 0;
|
||||
unsigned long long downloadSize;
|
||||
unsigned long long narSize;
|
||||
store->queryMissing(targets, willBuild, willSubstitute, unknown,
|
||||
downloadSize, narSize);
|
||||
logger->stopWork();
|
||||
|
|
@ -796,9 +795,9 @@ static void processConnection(bool trusted, const std::string& userName,
|
|||
|
||||
/* Process client requests. */
|
||||
while (true) {
|
||||
WorkerOp op{};
|
||||
WorkerOp op;
|
||||
try {
|
||||
op = static_cast<WorkerOp>(readInt(from));
|
||||
op = (WorkerOp)readInt(from);
|
||||
} catch (Interrupted& e) {
|
||||
break;
|
||||
} catch (EndOfFile& e) {
|
||||
|
|
@ -848,8 +847,8 @@ static void sigChldHandler(int sigNo) {
|
|||
}
|
||||
|
||||
static void setSigChldAction(bool autoReap) {
|
||||
struct sigaction act {};
|
||||
struct sigaction oact {};
|
||||
struct sigaction act;
|
||||
struct sigaction oact;
|
||||
act.sa_handler = autoReap ? sigChldHandler : SIG_DFL;
|
||||
sigfillset(&act.sa_mask);
|
||||
act.sa_flags = 0;
|
||||
|
|
@ -903,7 +902,7 @@ static PeerInfo getPeerInfo(int remote) {
|
|||
|
||||
#if defined(SO_PEERCRED)
|
||||
|
||||
ucred cred{};
|
||||
ucred cred;
|
||||
socklen_t credLen = sizeof(cred);
|
||||
if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == -1) {
|
||||
throw SysError("getting peer credentials");
|
||||
|
|
@ -969,7 +968,7 @@ static void daemonLoop(char** argv) {
|
|||
}
|
||||
Path socketPathRel = "./" + baseNameOf(socketPath);
|
||||
|
||||
struct sockaddr_un addr {};
|
||||
struct sockaddr_un addr;
|
||||
addr.sun_family = AF_UNIX;
|
||||
strncpy(addr.sun_path, socketPathRel.c_str(), sizeof(addr.sun_path));
|
||||
if (addr.sun_path[sizeof(addr.sun_path) - 1] != '\0') {
|
||||
|
|
@ -982,8 +981,7 @@ static void daemonLoop(char** argv) {
|
|||
(everybody can connect --- provided they have access to the
|
||||
directory containing the socket). */
|
||||
mode_t oldMode = umask(0111);
|
||||
int res = bind(fdSocket.get(), reinterpret_cast<struct sockaddr*>(&addr),
|
||||
sizeof(addr));
|
||||
int res = bind(fdSocket.get(), (struct sockaddr*)&addr, sizeof(addr));
|
||||
umask(oldMode);
|
||||
if (res == -1) {
|
||||
throw SysError(format("cannot bind to socket '%1%'") % socketPath);
|
||||
|
|
@ -1004,12 +1002,11 @@ static void daemonLoop(char** argv) {
|
|||
while (true) {
|
||||
try {
|
||||
/* Accept a connection. */
|
||||
struct sockaddr_un remoteAddr {};
|
||||
struct sockaddr_un remoteAddr;
|
||||
socklen_t remoteAddrLen = sizeof(remoteAddr);
|
||||
|
||||
AutoCloseFD remote = accept(
|
||||
fdSocket.get(), reinterpret_cast<struct sockaddr*>(&remoteAddr),
|
||||
&remoteAddrLen);
|
||||
AutoCloseFD remote =
|
||||
accept(fdSocket.get(), (struct sockaddr*)&remoteAddr, &remoteAddrLen);
|
||||
checkInterrupt();
|
||||
if (!remote) {
|
||||
if (errno == EINTR) {
|
||||
|
|
@ -1094,7 +1091,7 @@ static int _main(int argc, char** argv) {
|
|||
auto stdio = false;
|
||||
|
||||
parseCmdLine(argc, argv,
|
||||
[&](Strings::iterator& arg, const Strings::iterator& _end) {
|
||||
[&](Strings::iterator& arg, const Strings::iterator& end) {
|
||||
if (*arg == "--daemon") {
|
||||
; /* ignored for backwards compatibility */
|
||||
} else if (*arg == "--help") {
|
||||
|
|
@ -1132,8 +1129,7 @@ static int _main(int argc, char** argv) {
|
|||
throw Error(format("socket name %1% is too long") % socketName);
|
||||
}
|
||||
|
||||
if (connect(s, reinterpret_cast<struct sockaddr*>(&addr),
|
||||
sizeof(addr)) == -1) {
|
||||
if (connect(s, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
|
||||
throw SysError(format("cannot connect to daemon at %1%") %
|
||||
socketPath);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue