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

refactor(3p/nix/libutil): Replace string2Int & trim functions

Browse source 
Replaces these functions with corresponding functions from Abseil,
namely absl::StripAsciiWhitespace and absl::SimpleAtoi.

In the course of doing this some minor things I encountered along the
way were also refactored.

This also changes the signatures of the various custom readFile
functions to use absl::string_view types.
This commit is contained in:
Vincent Ambo 2020-05-25 01:19:02 +01:00
parent b371821db5
commit 98299da0fd
19 changed files with 84 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

13
third_party/nix/src/libstore/binary-cache-store.cc vendored
View file

@ -4,6 +4,9 @@
#include <future>
#include <memory>
#include <absl/strings/ascii.h>
#include <absl/strings/numbers.h>
#include "archive.hh"
#include "compression.hh"
#include "derivations.hh"
@ -21,7 +24,8 @@ namespace nix {
BinaryCacheStore::BinaryCacheStore(const Params& params) : Store(params) {
if (secretKeyFile != "") {
secretKey = std::make_unique<SecretKey>(readFile(secretKeyFile));
const std::string& secret_key_file = secretKeyFile;
secretKey = std::make_unique<SecretKey>(readFile(secret_key_file));
}
StringSink sink;
@ -43,7 +47,8 @@ void BinaryCacheStore::init() {
continue;
}
auto name = line.substr(0, colon);
auto value = trim(line.substr(colon + 1, std::string::npos));
auto value =
absl::StripAsciiWhitespace(line.substr(colon + 1, std::string::npos));
if (name == "StoreDir") {
if (value != storeDir) {
throw Error(format("binary cache '%s' is for Nix stores with prefix "
@ -53,7 +58,9 @@ void BinaryCacheStore::init() {
} else if (name == "WantMassQuery") {
wantMassQuery_ = value == "1";
} else if (name == "Priority") {
string2Int(value, priority);
if (!absl::SimpleAtoi(value, &priority)) {
LOG(WARNING) << "Invalid 'Priority' value: " << value;
}
}
}
}