From d5a5a83ad4fb8aba3b334039f567267a0463ee5a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Feb 2012 18:27:45 +0100 Subject: Use data() instead of c_str() where appropriate --- src/libutil/util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libutil/util.cc') diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 0352754f592c..42e5519b48b0 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -236,7 +236,7 @@ void writeFile(const Path & path, const string & s) AutoCloseFD fd = open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0666); if (fd == -1) throw SysError(format("opening file `%1%'") % path); - writeFull(fd, (unsigned char *) s.c_str(), s.size()); + writeFull(fd, (unsigned char *) s.data(), s.size()); } @@ -263,7 +263,7 @@ string readLine(int fd) void writeLine(int fd, string s) { s += '\n'; - writeFull(fd, (const unsigned char *) s.c_str(), s.size()); + writeFull(fd, (const unsigned char *) s.data(), s.size()); } @@ -485,7 +485,7 @@ void printMsg_(Verbosity level, const format & f) prefix = "\033[" + escVerbosity(level) + "s"; string s = (format("%1%%2%\n") % prefix % f.str()).str(); try { - writeToStderr((const unsigned char *) s.c_str(), s.size()); + writeToStderr((const unsigned char *) s.data(), s.size()); } catch (SysError & e) { /* Ignore failing writes to stderr if we're in an exception handler, otherwise throw an exception. We need to ignore -- cgit 1.4.1