auto upstream

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d39336f11e6..ff45c4b2a83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-21  Ken Brown  <kbrown@cornell.edu>
+
+        * sheap.c (report_sheap_usage): Fix arguments of message1_no_log.
+
 2013-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * sheap.c (report_sheap_usage): Prefer message1_nolog.
diff --git a/src/sheap.c b/src/sheap.c
index 28597ec9b65..f8eec753268 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -93,5 +93,5 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
            bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
   /* Don't log messages, cause at this point, we're not allowed to create
      buffers.  */
-  message1_nolog ("%s", buf);
+  message1_nolog (buf);
 }