projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'logbl'.
[gnulib.git]
/
lib
/
xprintf.c
diff --git
a/lib/xprintf.c
b/lib/xprintf.c
index
7738cc4
..
bfd9ae0
100644
(file)
--- a/
lib/xprintf.c
+++ b/
lib/xprintf.c
@@
-1,5
+1,5
@@
/* printf wrappers that fail immediately for non-file-related errors
/* printf wrappers that fail immediately for non-file-related errors
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
, 2009-2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-26,54
+26,54
@@
/* 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;
- int
err
;
+ int
retval
;
va_start (args, format);
va_start (args, format);
-
err
= xvprintf (format, args);
+
retval
= xvprintf (format, args);
va_end (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
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"));
- 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
xfprintf (FILE *restrict stream, char const *restrict format, ...)
{
va_list args;
- int
err
;
+ int
retval
;
va_start (args, format);
va_start (args, format);
-
err
= xvfprintf (stream, format, args);
+
retval
= xvfprintf (stream, format, args);
va_end (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
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"));
- return
err
;
+ return
retval
;
}
}