* lib/xprintf.c (xprintf, xvprintf, xfprintf, xvfprintf): Adjust
variable name and comments.
Suggested by Bruno Haible.
Signed-off-by: Eric Blake <ebb9@byu.net>
+2007-10-22 Eric Blake <ebb9@byu.net>
+
+ Tweak x*printf documentation.
+ * lib/xprintf.c (xprintf, xvprintf, xfprintf, xvfprintf): Adjust
+ variable name and comments.
+ Suggested by Bruno Haible.
+
2007-10-22 Bruno Haible <bruno@clisp.org>
* lib/acl.c (copy_acl): Fix file name in comment.
2007-10-22 Bruno Haible <bruno@clisp.org>
* lib/acl.c (copy_acl): Fix file name in comment.
/* written by Jim Meyering */
/* written by Jim Meyering */
-/* Just like printf, but call error if it fails without setting
- the error indicator. */
+/* Just like printf, but call error if it fails without setting the
+ stream's error indicator. */
int
xprintf (char const *restrict format, ...)
{
va_list args;
int
xprintf (char const *restrict format, ...)
{
va_list args;
- err = xvprintf (format, args);
+ retval = xvprintf (format, args);
-/* Just like vprintf, but call error if it fails without setting
- the error indicator. */
+/* Just like vprintf, but call error if it fails without setting the
+ stream's error indicator. */
int
xvprintf (char const *restrict format, va_list args)
{
int
xvprintf (char const *restrict format, va_list args)
{
- int err = vprintf (format, args);
- if (err < 0 && ! ferror (stdout))
+ int retval = vprintf (format, args);
+ if (retval < 0 && ! ferror (stdout))
error (exit_failure, errno, gettext ("cannot perform formatted output"));
error (exit_failure, errno, gettext ("cannot perform formatted output"));
-/* Just like fprintf, but call error if it fails without setting
- the error indicator. */
+/* Just like fprintf, but call error if it fails without setting the
+ stream's error indicator. */
int
xfprintf (FILE *restrict stream, char const *restrict format, ...)
{
va_list args;
int
xfprintf (FILE *restrict stream, char const *restrict format, ...)
{
va_list args;
- err = xvfprintf (stream, format, args);
+ retval = xvfprintf (stream, format, args);
-/* Just like vfprintf, but call error if it fails without setting
- the error indicator. */
+/* Just like vfprintf, but call error if it fails without setting the
+ stream's error indicator. */
int
xvfprintf (FILE *restrict stream, char const *restrict format, va_list args)
{
int
xvfprintf (FILE *restrict stream, char const *restrict format, va_list args)
{
- int err = vfprintf (stream, format, args);
- if (err < 0 && ! ferror (stream))
+ int retval = vfprintf (stream, format, args);
+ if (retval < 0 && ! ferror (stream))
error (exit_failure, errno, gettext ("cannot perform formatted output"));
error (exit_failure, errno, gettext ("cannot perform formatted output"));