From: Date: Mon, 5 Sep 2011 08:00:43 +0000 (+0000) Subject: Suppress warnings around return value of write and symlink. X-Git-Tag: accepted/tizen/5.0/unified/20181102.024921~139 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac3e91896917b5d9e8b4467bd912b20e8668488a;p=platform%2Fupstream%2Fglog.git Suppress warnings around return value of write and symlink. git-svn-id: https://google-glog.googlecode.com/svn/trunk@97 eb4d4688-79bd-11dd-afb4-1d65580434c0 --- diff --git a/src/logging.cc b/src/logging.cc index 67e65f9..445d9f9 100644 --- a/src/logging.cc +++ b/src/logging.cc @@ -505,7 +505,7 @@ inline void LogDestination::SetEmailLogging(LogSeverity min_severity, static void WriteToStderr(const char* message, size_t len) { // Avoid using cerr from this module since we may get called during // exit code, and cerr may be partially or fully destroyed by then. - write(STDERR_FILENO, message, len); + fwrite(message, len, 1, stderr); } inline void LogDestination::MaybeLogToStderr(LogSeverity severity, @@ -728,14 +728,18 @@ bool LogFileObject::CreateLogfile(const char* time_pid_string) { // Make the symlink be relative (in the same dir) so that if the // entire log directory gets relocated the link is still valid. const char *linkdest = slash ? (slash + 1) : filename; - symlink(linkdest, linkpath.c_str()); // silently ignore failures + if (symlink(linkdest, linkpath.c_str()) != 0) { + // silently ignore failures + } // Make an additional link to the log file in a place specified by // FLAGS_log_link, if indicated if (!FLAGS_log_link.empty()) { linkpath = FLAGS_log_link + "/" + linkname; unlink(linkpath.c_str()); // delete old one if it exists - symlink(filename, linkpath.c_str()); // silently ignore failures + if (symlink(filename, linkpath.c_str()) != 0) { + // silently ignore failures + } } #endif } @@ -1222,7 +1226,9 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) { LogDestination::WaitForSinks(data_); const char* message = "*** Check failure stack trace: ***\n"; - write(STDERR_FILENO, message, strlen(message)); + if (write(STDERR_FILENO, message, strlen(message)) < 0) { + // Ignore errors. + } Fail(); } } diff --git a/src/signalhandler.cc b/src/signalhandler.cc index 9fc91b3..7c8fe57 100644 --- a/src/signalhandler.cc +++ b/src/signalhandler.cc @@ -142,7 +142,9 @@ class MinimalFormatter { // Writes the given data with the size to the standard error. void WriteToStderr(const char* data, int size) { - write(STDERR_FILENO, data, size); + if (write(STDERR_FILENO, data, size) < 0) { + // Ignore errors. + } } // The writer function can be changed by InstallFailureWriter(). diff --git a/src/signalhandler_unittest.cc b/src/signalhandler_unittest.cc index 5493e52..1cd0fa0 100644 --- a/src/signalhandler_unittest.cc +++ b/src/signalhandler_unittest.cc @@ -58,7 +58,9 @@ void* DieInThread(void*) { } void WriteToStdout(const char* data, int size) { - write(STDOUT_FILENO, data, size); + if (write(STDOUT_FILENO, data, size) < 0) { + // Ignore errors. + } } int main(int argc, char **argv) { diff --git a/src/utilities.cc b/src/utilities.cc index a1ee57e..52b802a 100644 --- a/src/utilities.cc +++ b/src/utilities.cc @@ -79,7 +79,9 @@ static const int kPrintfPointerFieldWidth = 2 + 2 * sizeof(void*); static void DebugWriteToStderr(const char* data, void *unused) { // This one is signal-safe. - write(STDERR_FILENO, data, strlen(data)); + if (write(STDERR_FILENO, data, strlen(data)) < 0) { + // Ignore errors. + } } void DebugWriteToString(const char* data, void *arg) {