wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

Use std::vector::data()

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-09 10:50:55 +02:00
parent f2b67fbf2a
commit 7c4501886d
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libutil/util.cc
View file

@ -927,10 +927,10 @@ pid_t startProcess(std::function<void()> fun, const ProcessOptions & options)
}
std::vector<const char *> stringsToCharPtrs(const Strings & ss)
std::vector<char *> stringsToCharPtrs(const Strings & ss)
{
std::vector<const char *> res;
for (auto & s : ss) res.push_back(s.c_str());
std::vector<char *> res;
for (auto & s : ss) res.push_back((char *) s.c_str());
res.push_back(0);
return res;
}
@ -957,12 +957,11 @@ string runProgram(Path program, bool searchPath, const Strings & args,
Strings args_(args);
args_.push_front(program);
auto cargs = stringsToCharPtrs(args_);
if (searchPath)
execvp(program.c_str(), (char * *) &cargs[0]);
execvp(program.c_str(), stringsToCharPtrs(args_).data());
else
execv(program.c_str(), (char * *) &cargs[0]);
execv(program.c_str(), stringsToCharPtrs(args_).data());
throw SysError(format("executing ‘%1%’") % program);
});