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

Use data() instead of c_str() where appropriate

Browse source
This commit is contained in:
Eelco Dolstra 2012-02-09 18:27:45 +01:00
parent ec2827f5fc
commit d5a5a83ad4
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/build.cc
View file

@ -1379,7 +1379,7 @@ HookReply DerivationGoal::tryBuildHook()
break;
}
s += "\n";
writeToStderr((unsigned char *) s.c_str(), s.size());
writeToStderr((unsigned char *) s.data(), s.size());
}
debug(format("hook reply is `%1%'") % reply);
@ -2036,12 +2036,12 @@ void DerivationGoal::handleChildOutput(int fd, const string & data)
(!hook && fd == builderOut.readSide))
{
if (verbosity >= buildVerbosity)
writeToStderr((unsigned char *) data.c_str(), data.size());
writeFull(fdLogFile, (unsigned char *) data.c_str(), data.size());
writeToStderr((unsigned char *) data.data(), data.size());
writeFull(fdLogFile, (unsigned char *) data.data(), data.size());
}
if (hook && fd == hook->fromHook.readSide)
writeToStderr((unsigned char *) data.c_str(), data.size());
writeToStderr((unsigned char *) data.data(), data.size());
}
@ -2409,7 +2409,7 @@ void SubstitutionGoal::handleChildOutput(int fd, const string & data)
{
assert(fd == logPipe.readSide);
if (verbosity >= buildVerbosity)
writeToStderr((unsigned char *) data.c_str(), data.size());
writeToStderr((unsigned char *) data.data(), data.size());
/* Don't write substitution output to a log file for now. We
probably should, though. */
}

2
src/libstore/gc.cc
View file

@ -196,7 +196,7 @@ void LocalStore::addTempRoot(const Path & path)
lockFile(fdTempRoots, ltWrite, true);
string s = path + '\0';
writeFull(fdTempRoots, (const unsigned char *) s.c_str(), s.size());
writeFull(fdTempRoots, (const unsigned char *) s.data(), s.size());
/* Downgrade to a read lock. */
debug(format("downgrading to read lock on `%1%'") % fnTempRoots);

2
src/libstore/references.cc
View file

@ -69,7 +69,7 @@ void RefScanSink::operator () (const unsigned char * data, size_t len)
fragment, so search in the concatenation of the tail of the
previous fragment and the start of the current fragment. */
string s = tail + string((const char *) data, len > refLength ? refLength : len);
search((const unsigned char *) s.c_str(), s.size(), hashes, seen);
search((const unsigned char *) s.data(), s.size(), hashes, seen);
search(data, len, hashes, seen);

4
src/libstore/remote-store.cc
View file

@ -509,7 +509,7 @@ void RemoteStore::processStderr(Sink * sink, Source * source)
if (msg == STDERR_WRITE) {
string s = readString(from);
if (!sink) throw Error("no sink");
(*sink)((const unsigned char *) s.c_str(), s.size());
(*sink)((const unsigned char *) s.data(), s.size());
}
else if (msg == STDERR_READ) {
if (!source) throw Error("no source");
@ -521,7 +521,7 @@ void RemoteStore::processStderr(Sink * sink, Source * source)
}
else {
string s = readString(from);
writeToStderr((const unsigned char *) s.c_str(), s.size());
writeToStderr((const unsigned char *) s.data(), s.size());
}
}
if (msg == STDERR_ERROR) {