about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-13 21:10:29 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-13 21:10:29 -0400
commit20030ae6d7e7187d7caf1b23c4aa5471fcf56d47 (patch)
tree865de134643c017be59784f773dfb233666031a9
parentfcabc0f8b185f9e0a9289720be5ede6c39b3bf21 (diff)
downloadglibc-20030ae6d7e7187d7caf1b23c4aa5471fcf56d47.tar.gz
glibc-20030ae6d7e7187d7caf1b23c4aa5471fcf56d47.tar.xz
glibc-20030ae6d7e7187d7caf1b23c4aa5471fcf56d47.zip
Fix error messages in test.
-rw-r--r--ChangeLog2
-rw-r--r--libio/tst_putwc.c11
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ca2d5856d..839ad68d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-13  Ulrich Drepper  <drepper@gmail.com>
 
+	* libio/tst_putwc.c: Fix error messages.
+
 	[BZ #12724]
 	* libio/fileops.c (_IO_new_file_close_it): Always flush when
 	currently writing and seek to current position when not.
diff --git a/libio/tst_putwc.c b/libio/tst_putwc.c
index 1fd21e26c4..c6e7a9dbd7 100644
--- a/libio/tst_putwc.c
+++ b/libio/tst_putwc.c
@@ -1,5 +1,5 @@
 /* Simple test of putwc in the C locale.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
@@ -74,13 +74,16 @@ do_test (void)
   /* Now close the file, open it again, and read again.  */
   if (fclose (fp) != 0)
     {
-      printf ("failure during fclose(): %m");
+      printf ("failure during fclose: %m\n");
       res = 1;
     }
 
   fp = fopen (outname, "r");
   if (fp == NULL)
-    error (EXIT_FAILURE, errno, "cannot reopen file");
+    {
+      printf ("cannot reopen file: %m\n");
+      return 1;
+    }
 
   /* We can remove the file now.  */
   remove (outname);
@@ -104,7 +107,7 @@ do_test (void)
 
   if (fclose (fp) != 0)
     {
-      puts ("failure during fclose()");
+      printf ("failure during fclose: %m\n");
       res = 1;
     }