summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-09-13 10:29:28 +0000
committerJim Meyering <jim@meyering.net>2003-09-13 10:29:28 +0000
commitc32fb8f43e8e8f4b8675710cfd3c0786d7169bd6 (patch)
tree56a685a410ec8d46778705cf6067de490b203e01
parentd366ff1e4a931dd0d92e607b2a8cf49dc7395a2c (diff)
downloadcoreutils-c32fb8f43e8e8f4b8675710cfd3c0786d7169bd6.tar.xz
(error_tail): Assume vprintf.
-rw-r--r--lib/error.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/error.c b/lib/error.c
index 5baec4574..858ad2477 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -132,11 +132,10 @@ print_errno_message (int errnum)
static void
error_tail (int status, int errnum, const char *message, va_list args)
{
-#if HAVE_VPRINTF || _LIBC
-# if _LIBC
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
{
-# define ALLOCA_LIMIT 2000
+# define ALLOCA_LIMIT 2000
size_t len = strlen (message) + 1;
wchar_t *wmessage = NULL;
mbstate_t st;
@@ -174,11 +173,8 @@ error_tail (int status, int errnum, const char *message, va_list args)
__vfwprintf (stderr, wmessage, args);
}
else
-# endif
- vfprintf (stderr, message, args);
-#else
- _doprnt (message, args, stderr);
#endif
+ vfprintf (stderr, message, args);
va_end (args);
++error_message_count;
@@ -200,7 +196,6 @@ error_tail (int status, int errnum, const char *message, va_list args)
format string with optional args.
If ERRNUM is nonzero, print its corresponding system error message.
Exit with status STATUS if it is nonzero. */
-/* VARARGS */
void
error (int status, int errnum, const char *message, ...)
{