nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: int2String -> std::to_string.

This commit is contained in:
Eelco Dolstra 2015-12-02 16:51:00 +02:00 committed by Ludovic Courtès
parent 60c7c364f8
commit 79aa1a8305
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/libutil/archive.cc
View File

@ -256,7 +256,7 @@ static void parse(ParseSink & sink, Source & source, const Path & path)
if (i != names.end()) { if (i != names.end()) {
printMsg(lvlDebug, format("case collision between `%1%' and `%2%'") % i->first % name); printMsg(lvlDebug, format("case collision between `%1%' and `%2%'") % i->first % name);
name += caseHackSuffix; name += caseHackSuffix;
name += int2String(++i->second); name += std::to_string(++i->second);
} else } else
names[name] = 0; names[name] = 0;
} }

2
nix/libutil/util.cc
View File

@ -433,7 +433,7 @@ Nest::~Nest()
static string escVerbosity(Verbosity level) static string escVerbosity(Verbosity level)
{ {
return int2String((int) level); return std::to_string((int) level);
} }

7
nix/libutil/util.hh
View File

@ -337,13 +337,6 @@ template<class N> bool string2Int(const string & s, N & n)
return str && str.get() == EOF; return str && str.get() == EOF;
} }
template<class N> string int2String(N n)
{
std::ostringstream str;
str << n;
return str.str();
}
/* Return true iff `s' ends in `suffix'. */ /* Return true iff `s' ends in `suffix'. */
bool hasSuffix(const string & s, const string & suffix); bool hasSuffix(const string & s, const string & suffix);

14
nix/nix-daemon/nix-daemon.cc
View File

@ -538,8 +538,8 @@ static void performOp(bool trusted, unsigned int clientVersion,
settings.keepGoing = readInt(from) != 0; settings.keepGoing = readInt(from) != 0;
settings.set("build-fallback", readInt(from) ? "true" : "false"); settings.set("build-fallback", readInt(from) ? "true" : "false");
verbosity = (Verbosity) readInt(from); verbosity = (Verbosity) readInt(from);
settings.set("build-max-jobs", int2String(readInt(from))); settings.set("build-max-jobs", std::to_string(readInt(from)));
settings.set("build-max-silent-time", int2String(readInt(from))); settings.set("build-max-silent-time", std::to_string(readInt(from)));
if (GET_PROTOCOL_MINOR(clientVersion) >= 2) if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
settings.useBuildHook = readInt(from) != 0; settings.useBuildHook = readInt(from) != 0;
if (GET_PROTOCOL_MINOR(clientVersion) >= 4) { if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
@ -548,7 +548,7 @@ static void performOp(bool trusted, unsigned int clientVersion,
settings.printBuildTrace = readInt(from) != 0; settings.printBuildTrace = readInt(from) != 0;
} }
if (GET_PROTOCOL_MINOR(clientVersion) >= 6) if (GET_PROTOCOL_MINOR(clientVersion) >= 6)
settings.set("build-cores", int2String(readInt(from))); settings.set("build-cores", std::to_string(readInt(from)));
if (GET_PROTOCOL_MINOR(clientVersion) >= 10) if (GET_PROTOCOL_MINOR(clientVersion) >= 10)
settings.set("build-use-substitutes", readInt(from) ? "true" : "false"); settings.set("build-use-substitutes", readInt(from) ? "true" : "false");
if (GET_PROTOCOL_MINOR(clientVersion) >= 12) { if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
@ -819,7 +819,7 @@ static void daemonLoop()
/* Handle socket-based activation by systemd. */ /* Handle socket-based activation by systemd. */
if (getEnv("LISTEN_FDS") != "") { if (getEnv("LISTEN_FDS") != "") {
if (getEnv("LISTEN_PID") != int2String(getpid()) || getEnv("LISTEN_FDS") != "1") if (getEnv("LISTEN_PID") != std::to_string(getpid()) || getEnv("LISTEN_FDS") != "1")
throw Error("unexpected systemd environment variables"); throw Error("unexpected systemd environment variables");
fdSocket = SD_LISTEN_FDS_START; fdSocket = SD_LISTEN_FDS_START;
} }
@ -906,10 +906,10 @@ static void daemonLoop()
clientPid = cred.pid; clientPid = cred.pid;
struct passwd * pw = getpwuid(cred.uid); struct passwd * pw = getpwuid(cred.uid);
string user = pw ? pw->pw_name : int2String(cred.uid); string user = pw ? pw->pw_name : std::to_string(cred.uid);
struct group * gr = getgrgid(cred.gid); struct group * gr = getgrgid(cred.gid);
string group = gr ? gr->gr_name : int2String(cred.gid); string group = gr ? gr->gr_name : std::to_string(cred.gid);
Strings trustedUsers = settings.get("trusted-users", Strings({"root"})); Strings trustedUsers = settings.get("trusted-users", Strings({"root"}));
Strings allowedUsers = settings.get("allowed-users", Strings({"*"})); Strings allowedUsers = settings.get("allowed-users", Strings({"*"}));
@ -937,7 +937,7 @@ static void daemonLoop()
/* For debugging, stuff the pid into argv[1]. */ /* For debugging, stuff the pid into argv[1]. */
if (clientPid != -1 && argvSaved[1]) { if (clientPid != -1 && argvSaved[1]) {
string processName = int2String(clientPid); string processName = std::to_string(clientPid);
strncpy(argvSaved[1], processName.c_str(), strlen(argvSaved[1])); strncpy(argvSaved[1], processName.c_str(), strlen(argvSaved[1]));
} }