From 796190dd51fa52a7a35be072c0eeeb7c37710c4d Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 22 Oct 2007 16:05:18 -0600 Subject: [PATCH] Tweak x*printf documentation. * lib/xprintf.c (xprintf, xvprintf, xfprintf, xvfprintf): Adjust variable name and comments. Suggested by Bruno Haible. Signed-off-by: Eric Blake --- ChangeLog | 7 +++++++ lib/xprintf.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index c05974ac5..cf77f51ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-22 Eric Blake + + 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 * lib/acl.c (copy_acl): Fix file name in comment. diff --git a/lib/xprintf.c b/lib/xprintf.c index 7738cc4ee..8f279faf4 100644 --- a/lib/xprintf.c +++ b/lib/xprintf.c @@ -26,54 +26,54 @@ /* 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 err; + int retval; va_start (args, format); - err = xvprintf (format, args); + retval = xvprintf (format, args); va_end (args); - return err; + return retval; } -/* 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 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")); - return err; + return retval; } -/* 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 err; + int retval; va_start (args, format); - err = xvfprintf (stream, format, args); + retval = xvfprintf (stream, format, args); va_end (args); - return err; + return retval; } -/* 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 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")); - return err; + return retval; } -- 2.11.0