commit afe6360627ef3f0e9bc8f45535fbfae3354f3ae0
author Elliott Hughes <enh@google.com> Wed Jul 23 11:38:38 2014 -0700
committer Elliott Hughes <enh@google.com> Wed Jul 23 11:38:38 2014 -0700
tree 81d3cf23f17e54ad6362ed474f6f0fb822574ffd
parent 467e49be70231f55bd7ba908407b4413294d3bfc

Fix belated review comments on syslog change.

Bug: 14292866
Change-Id: I3cd92084cb55b5673f6ba62d51952941b79deb51

libc/bionic/libc_logging.cpp

diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp
index d6fa1db..b57e242 100644
--- a/libc/bionic/libc_logging.cpp
+++ b/libc/bionic/libc_logging.cpp
@@ -230,6 +230,7 @@
 /* Perform formatted output to an output target 'o' */
 template <typename Out>
 static void out_vformat(Out& o, const char* format, va_list args) {
+    int caller_errno = errno;
     int nn = 0;
 
     for (;;) {
@@ -380,7 +381,7 @@
             buffer[1] = '\0';
         } else if (c == 'm') {
             // syslog-like %m for strerror(errno).
-            str = strerror(errno);
+            str = strerror(caller_errno);
         } else {
             __assert(__FILE__, __LINE__, "conversion specifier unsupported");
         }