maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): revert "apply all clang-tidy fixes"

Browse source 
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 2020-08-01 15:32:00 -07:00 • committed by kanepyork
parent cc3c45f739
commit 72fc2fd27e
64 changed files with 479 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/libstore/derivations.cc vendored
View file

@ -96,7 +96,7 @@ static void expect(std::istream& str, const std::string& s) {
static std::string parseString(std::istream& str) {
std::string res;
expect(str, "\"");
int c = 0;
int c;
while ((c = str.get()) != '"') {
if (c == '\\') {
c = str.get();
@ -107,10 +107,10 @@ static std::string parseString(std::istream& str) {
} else if (c == 't') {
res += '\t';
} else {
res += std::to_string(c);
res += c;
}
} else {
res += std::to_string(c);
res += c;
}
}
return res;