projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
124a808
)
Assume vprintf.
author
Paul Eggert
<eggert@cs.ucla.edu>
Fri, 12 Sep 2003 19:47:20 +0000
(19:47 +0000)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Fri, 12 Sep 2003 19:47:20 +0000
(19:47 +0000)
lib/error.c
patch
|
blob
|
history
m4/error.m4
patch
|
blob
|
history
diff --git
a/lib/error.c
b/lib/error.c
index 5baec457433152c018af1c352245ebab5ce90c3f..858ad247785611bf5166b7d971c6a987c8df1552 100644
(file)
--- 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)
{
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)
{
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;
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
__vfwprintf (stderr, wmessage, args);
}
else
-# endif
- vfprintf (stderr, message, args);
-#else
- _doprnt (message, args, stderr);
#endif
#endif
+ vfprintf (stderr, message, args);
va_end (args);
++error_message_count;
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. */
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, ...)
{
void
error (int status, int errnum, const char *message, ...)
{
diff --git
a/m4/error.m4
b/m4/error.m4
index 05b28bff83bc0ae8272d647ee72466b9adff2640..0bc2e6899de0b4b81d97fed779e8a1c10f57bdd4 100644
(file)
--- a/
m4/error.m4
+++ b/
m4/error.m4
@@
-1,4
+1,4
@@
-#serial
8
+#serial
9
AC_DEFUN([gl_ERROR],
[
AC_DEFUN([gl_ERROR],
[
@@
-10,6
+10,6
@@
AC_DEFUN([gl_ERROR],
# Prerequisites of lib/error.c.
AC_DEFUN([jm_PREREQ_ERROR],
[
# Prerequisites of lib/error.c.
AC_DEFUN([jm_PREREQ_ERROR],
[
- AC_REQUIRE([AC_FUNC_
VPRINTF
])
- AC_FUNC_STRERROR_R
+ AC_REQUIRE([AC_FUNC_
STRERROR_R
])
+ :
])
])