From 20030ae6d7e7187d7caf1b23c4aa5471fcf56d47 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 13 May 2011 21:10:29 -0400 Subject: [PATCH] Fix error messages in test. --- ChangeLog | 2 ++ libio/tst_putwc.c | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ca2d58..839ad68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-05-13 Ulrich Drepper + * 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 1fd21e2..c6e7a9d 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 , 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; } -- 2.7.4