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

refactor(3p/nix): Replace tokenizeStrings with absl::StrSplit

Browse source 
This function was a custom (and inefficient in the case of
single-character delimiters) string splitter which was used all over
the codebase. Abseil provides an appropriate replacement function.
This commit is contained in:
Vincent Ambo 2020-05-25 15:54:14 +01:00
parent b99b368d17
commit bf452cbc2a
29 changed files with 146 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/libstore/local-store.cc vendored
View file

@ -8,6 +8,7 @@
#include <iostream>
#include <absl/strings/numbers.h>
#include <absl/strings/str_split.h>
#include <fcntl.h>
#include <glog/logging.h>
#include <grp.h>
@ -477,14 +478,15 @@ static void canonicalisePathMetaData_(const Path& path, uid_t fromUid,
throw SysError("querying extended attributes of '%s'", path);
}
for (auto& eaName : tokenizeString<Strings>(
std::string(eaBuf.data(), eaSize), std::string("\000", 1))) {
for (auto& eaName :
absl::StrSplit(std::string(eaBuf.data(), eaSize),
absl::ByString(std::string("\000", 1)))) {
/* Ignore SELinux security labels since these cannot be
removed even by root. */
if (eaName == "security.selinux") {
continue;
}
if (lremovexattr(path.c_str(), eaName.c_str()) == -1) {
if (lremovexattr(path.c_str(), std::string(eaName).c_str()) == -1) {
throw SysError("removing extended attribute '%s' from '%s'", eaName,
path);
}
@ -702,7 +704,7 @@ void LocalStore::queryPathInfoUncached(
s = (const char*)sqlite3_column_text(state->stmtQueryPathInfo, 6);
if (s != nullptr) {
info->sigs = tokenizeString<StringSet>(s, " ");
info->sigs = absl::StrSplit(s, absl::ByChar(' '));
}
s = (const char*)sqlite3_column_text(state->stmtQueryPathInfo, 7);