* lib/xprintf.c: Don't bother testing specific errno values. Just test ferror.

diff --git a/ChangeLog b/ChangeLog
index d837fc11c991175c28bb631f892888a1d3ed25e2..eefe9854484a9ef98a9b03f623aff325649d2fe4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-10-19  Jim Meyering  <meyering@redhat.com>
 
        * lib/xprintf.c (xprintf, xfprintf): Test err < 0, not just "err".
+       Don't bother testing specific errno values.  Just test ferror.
 
        New module: xprintf
        * modules/xprintf, lib/xprintf.c, lib/xprintf.h: New files.

diff --git a/lib/xprintf.c b/lib/xprintf.c
index 908fc4f11e8122305705aa87434c3d8c14b9318b..2134e261418fbafee05bb053c404a572247a7f09 100644 (file)
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -29,29 +29,29 @@
 
 /* written by Jim Meyering */
 
-/* Just like printf, but call error if it fails for any reason
-   for which printf does not set the stream error indicator.  */
+/* Just like printf, but call error if it fails without setting
+   the error indicator.  */
 int
 xprintf (char const *restrict format, ...)
 {
   va_list args;
   va_start (args, format);
   int err = vprintf (format, args);
-  if (err < 0 && (errno == EILSEQ || errno == EINVAL || errno == ENOMEM))
+  if (err < 0 && ! ferror (stdout))
     error (exit_failure, errno, gettext ("write error"));
 
   return err;
 }
 
-/* Just like fprintf, but call error if it fails for any reason
-   for which printf does not set the stream error indicator.  */
+/* Just like fprintf, but call error if it fails without setting
+   the error indicator.  */
 int
 xfprintf (FILE *restrict stream, char const *restrict format, ...)
 {
   va_list args;
   va_start (args, format);
   int err = vfprintf (stream, format, args);
-  if (err < 0 && (errno == EILSEQ || errno == EINVAL || errno == ENOMEM))
+  if (err < 0 && ! ferror (stream))
     error (exit_failure, errno, gettext ("write error"));
 
   return err;