summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--malloc/obstack.c5
-rw-r--r--misc/err.c2
-rw-r--r--misc/error.c2
4 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7cd89cb909..445c75eab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* misc/error.c (error_tail): Use fputws_unlocked instead of fputws.
+	* misc/err.c (convert_and_print): Likewise.
+
+	* malloc/obstack.c (print_and_abort): Use fprintf instead of two
+	function calls.
+
 2001-08-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h: Revert the
diff --git a/malloc/obstack.c b/malloc/obstack.c
index e5c0c40de4..06b2fbd534 100644
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -489,10 +489,7 @@ print_and_abort ()
     __fwprintf (stderr, L"%s\n", _("memory exhausted"));
   else
 #endif
-    {
-      fputs (_("memory exhausted"), stderr);
-      fputc ('\n', stderr);
-    }
+    fprintf (stderr, "%s\n", _("memory exhausted"));
   exit (obstack_exit_failure);
 }
 
diff --git a/misc/err.c b/misc/err.c
index 4c372032fa..1e681b399d 100644
--- a/misc/err.c
+++ b/misc/err.c
@@ -69,7 +69,7 @@ convert_and_print (const char *format, __gnuc_va_list ap)
 
 	  if (wformat == NULL)
 	    {
-	      fputws (L"out of memory\n", stderr);
+	      fputws_unlocked (L"out of memory\n", stderr);
 	      return;
 	    }
 	}
diff --git a/misc/error.c b/misc/error.c
index 1c9c4a6850..aa0d8bbea7 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -151,7 +151,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
 
 	      if (wmessage == NULL)
 		{
-		  fputws (L"out of memory\n", stderr);
+		  fputws_unlocked (L"out of memory\n", stderr);
 		  return;
 		}
 	    }