xprintf fixes.

* lib/xprintf.c (xprintf, xfprintf): Use va_end.
Use a clearer diagnostic.
Patch from Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 96a9a09bdfff5ccd197ad15f1e069f5e87f12677..159f69efbf8b88e643db897bd704f3ace5621b04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-20  Jim Meyering  <meyering@redhat.com>
+
+       xprintf fixes.
+       * lib/xprintf.c (xprintf, xfprintf): Use va_end.
+       Use a clearer diagnostic.
+       Patch from Bruno Haible.
+
 2007-10-20  Bruno Haible  <bruno@clisp.org>
 
        * lib/vasnprintf.c (VASNPRINTF): Don't report overflow if the available

diff --git a/lib/xprintf.c b/lib/xprintf.c
index 2134e261418fbafee05bb053c404a572247a7f09..6ecd2a2ad711d7262e78092094004a8b251d2f01 100644 (file)
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -38,7 +38,8 @@ xprintf (char const *restrict format, ...)
   va_start (args, format);
   int err = vprintf (format, args);
   if (err < 0 && ! ferror (stdout))
-    error (exit_failure, errno, gettext ("write error"));
+    error (exit_failure, errno, gettext ("cannot perform formatted output"));
+  va_end (args);
 
   return err;
 }
@@ -52,7 +53,8 @@ xfprintf (FILE *restrict stream, char const *restrict format, ...)
   va_start (args, format);
   int err = vfprintf (stream, format, args);
   if (err < 0 && ! ferror (stream))
-    error (exit_failure, errno, gettext ("write error"));
+    error (exit_failure, errno, gettext ("cannot perform formatted output"));
+  va_end (args);
 
   return err;
 }