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

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

Browse source 
Change-Id: I265e763393422ee1881653527c91024458060825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-07-24 21:09:44 -07:00 • committed by kanepyork
parent 69f402563a
commit ef54f5da9f
65 changed files with 580 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

9
third_party/nix/src/libstore/store-api.cc vendored
View file

@ -262,7 +262,7 @@ Path Store::makeFixedOutputPath(bool recursive, const Hash& hash,
"output:out",
hashString(
htSHA256,
"fixed:out:" + (recursive ? (std::string) "r:" : "") +
"fixed:out:" + (recursive ? std::string("r:") : "") +
hash.to_string(Base16) + ":"),
name);
}
@ -782,7 +782,7 @@ ValidPathInfo decodeValidPathInfo(std::istream& str, bool hashGiven) {
}
getline(str, info.deriver);
std::string s;
int n;
int n = 0;
getline(str, s);
if (!absl::SimpleAtoi(s, &n)) {
throw Error("number expected");
@ -880,7 +880,7 @@ Strings ValidPathInfo::shortRefs() const {
}
std::string makeFixedOutputCA(bool recursive, const Hash& hash) {
return "fixed:" + (recursive ? (std::string) "r:" : "") + hash.to_string();
return "fixed:" + (recursive ? std::string("r:") : "") + hash.to_string();
}
void Store::addToStore(const ValidPathInfo& info, Source& narSource,
@ -926,7 +926,8 @@ std::pair<std::string, Store::Params> splitUriAndParams(
throw Error("invalid URI parameter '%s'", value);
}
try {
decoded += std::stoul(std::string(value, i + 1, 2), nullptr, 16);
decoded += std::to_string(
std::stoul(std::string(value, i + 1, 2), nullptr, 16));
i += 3;
} catch (...) {
throw Error("invalid URI parameter '%s'", value);