summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-01-20 15:03:04 +0000
committerJim Meyering <jim@meyering.net>2003-01-20 15:03:04 +0000
commit7565faca353379062b915ee8c45c112f60a964a3 (patch)
treecc6ff1e750dc36840e127748721f58709834a051 /lib
parent73af65ef562e72fb9e92f9bac9dbaaf13a778d41 (diff)
downloadcoreutils-7565faca353379062b915ee8c45c112f60a964a3.tar.xz
Merge in changes from libc
Eliminate many `#ifdef USE_IN_LIBIO' conditionals.
Diffstat (limited to 'lib')
-rw-r--r--lib/error.c40
1 files changed, 11 insertions, 29 deletions
diff --git a/lib/error.c b/lib/error.c
index 18c779e98..308ed3ccd 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000, 2001, 2002, 2003 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
the Free Software Foundation; either version 2, or (at your option)
@@ -93,12 +93,10 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
# define error __error
# define error_at_line __error_at_line
-# ifdef USE_IN_LIBIO
-# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
-# undef putc
-# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
-# endif
+# include <libio/iolibio.h>
+# define fflush(s) INTUSE(_IO_fflush) (s)
+# undef putc
+# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
#else /* not _LIBC */
@@ -163,7 +161,7 @@ print_errno_message (int errnum)
s = _("Unknown system error");
#endif
-#if _LIBC && USE_IN_LIBIO
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
{
__fwprintf (stderr, L": %s", s);
@@ -179,7 +177,7 @@ static void
error_tail (int status, int errnum, const char *message, va_list args)
{
# if HAVE_VPRINTF || _LIBC
-# if _LIBC && USE_IN_LIBIO
+# if _LIBC
if (_IO_fwide (stderr, 0) > 0)
{
# define ALLOCA_LIMIT 2000
@@ -230,7 +228,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
++error_message_count;
if (errnum)
print_errno_message (errnum);
-# if _LIBC && USE_IN_LIBIO
+# if _LIBC
if (_IO_fwide (stderr, 0) > 0)
putwc (L'\n', stderr);
else
@@ -265,17 +263,13 @@ error (status, errnum, message, va_alist)
fflush (stdout);
#ifdef _LIBC
-# ifdef USE_IN_LIBIO
_IO_flockfile (stderr);
-# else
- __flockfile (stderr);
-# endif
#endif
if (error_print_progname)
(*error_print_progname) ();
else
{
-#if _LIBC && USE_IN_LIBIO
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s: ", program_name);
else
@@ -299,11 +293,7 @@ error (status, errnum, message, va_alist)
#endif
#ifdef _LIBC
-# ifdef USE_IN_LIBIO
_IO_funlockfile (stderr);
-# else
- __funlockfile (stderr);
-# endif
#endif
}
@@ -346,17 +336,13 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
fflush (stdout);
#ifdef _LIBC
-# ifdef USE_IN_LIBIO
_IO_flockfile (stderr);
-# else
- __flockfile (stderr);
-# endif
#endif
if (error_print_progname)
(*error_print_progname) ();
else
{
-#if _LIBC && USE_IN_LIBIO
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s: ", program_name);
else
@@ -366,7 +352,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
if (file_name != NULL)
{
-#if _LIBC && USE_IN_LIBIO
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s:%d: ", file_name, line_number);
else
@@ -390,11 +376,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
#endif
#ifdef _LIBC
-# ifdef USE_IN_LIBIO
_IO_funlockfile (stderr);
-# else
- __funlockfile (stderr);
-# endif
#endif
}