[Bug-gnulib] 'error' module patch to assume C89 or better

[Paul Eggert]

I installed the following:

2003-09-08  Paul Eggert  <address@hidden>

        * lib/error.h (error, error_at_line, error_print_progname)
        [! (defined (__STDC__) && __STDC__)]: Remove decls.
        * lib/error.c: Include error.h first, to check interface.
        Include <stdarg.h>, <stdlib.h>, <string.h> unconditionally.
        (VA_START): Remove; all uses changeed to va_start.
        (exit, strerror): Remove decls.
        (error_print_progname): Prototype uncondionally.
        Don't include <errno.h>; no longer needed.
        (private_strerror): Remove.
        (error_tail): Always define.
        (error, error_at_line): Assume C89 or better; always use prototypes.
        * m4/error.m4 (jm_PREREQ_ERROR): Do not require STDC headers, and
        do not check for strerror.

Index: lib/error.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/error.h,v
retrieving revision 1.17
diff -p -u -r1.17 error.h
--- lib/error.h 4 Aug 2001 17:52:38 -0000       1.17
+++ lib/error.h 8 Sep 2003 23:20:51 -0000
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
 
 
    NOTE: The canonical source of this file is maintained with the GNU C 
Library.
@@ -40,8 +40,6 @@
 extern "C" {
 #endif
 
-#if defined (__STDC__) && __STDC__
-
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
@@ -57,12 +55,6 @@ extern void error_at_line (int status, i
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
 extern void (*error_print_progname) (void);
-
-#else
-void error ();
-void error_at_line ();
-extern void (*error_print_progname) ();
-#endif
 
 /* This variable is incremented each time `error' is called.  */
 extern unsigned int error_message_count;
Index: lib/error.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/error.c,v
retrieving revision 1.30
diff -p -u -r1.30 error.c
--- lib/error.c 4 Aug 2003 22:46:12 -0000       1.30
+++ lib/error.c 8 Sep 2003 23:20:51 -0000
@@ -20,7 +20,12 @@
 # include <config.h>
 #endif
 
+#include "error.h"
+
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _LIBC
 # include <libintl.h>
@@ -33,28 +38,6 @@
 # define mbsrtowcs __mbsrtowcs
 #endif
 
-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
-#  include <stdarg.h>
-#  define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-#  include <varargs.h>
-#  define VA_START(args, lastarg) va_start(args)
-# endif
-#else
-# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
-# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-#endif
-
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-void exit ();
-#endif
-
-#include "error.h"
-
 #if !_LIBC
 # include "unlocked-io.h"
 #endif
@@ -66,11 +49,7 @@ void exit ();
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
-void (*error_print_progname) (
-#if __STDC__ - 0
-                             void
-#endif
-                             );
+void (*error_print_progname) (void);
 
 /* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count;
@@ -79,7 +58,6 @@ unsigned int error_message_count;
 /* In the GNU C library, there is a predefined variable for this.  */
 
 # define program_name program_invocation_name
-# include <errno.h>
 # include <libio/libioP.h>
 
 /* In GNU libc we want do not want to use the common name `error' directly.
@@ -113,28 +91,7 @@ extern char *program_name;
 
 # if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
-# else
-#  if HAVE_STRERROR
-#   ifndef HAVE_DECL_STRERROR
-"this configure-time declaration test was not run"
-#   endif
-#   if !HAVE_DECL_STRERROR
-char *strerror ();
-#   endif
-#  else
-static char *
-private_strerror (int errnum)
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum > 0 && errnum <= sys_nerr)
-    return _(sys_errlist[errnum]);
-  return _("Unknown system error");
-}
-#   define strerror private_strerror
-#  endif /* HAVE_STRERROR */
-# endif        /* HAVE_STRERROR_R || defined strerror_r */
+# endif
 #endif /* not _LIBC */
 
 static void
@@ -172,7 +129,6 @@ print_errno_message (int errnum)
   fprintf (stderr, ": %s", s);
 }
 
-#ifdef VA_START
 static void
 error_tail (int status, int errnum, const char *message, va_list args)
 {
@@ -238,7 +194,6 @@ error_tail (int status, int errnum, cons
   if (status)
     exit (status);
 }
-#endif
 
 
 /* Print the program name and error message MESSAGE, which is a printf-style
@@ -247,19 +202,9 @@ error_tail (int status, int errnum, cons
    Exit with status STATUS if it is nonzero.  */
 /* VARARGS */
 void
-#if defined VA_START && __STDC__
 error (int status, int errnum, const char *message, ...)
-#else
-error (status, errnum, message, va_alist)
-     int status;
-     int errnum;
-     char *message;
-     va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   fflush (stdout);
 #ifdef _LIBC
@@ -277,20 +222,8 @@ error (status, errnum, message, va_alist
        fprintf (stderr, "%s: ", program_name);
     }
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   error_tail (status, errnum, message, args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-
-  ++error_message_count;
-  if (errnum)
-    print_errno_message (errnum);
-  putc ('\n', stderr);
-  fflush (stderr);
-  if (status)
-    exit (status);
-#endif
 
 #ifdef _LIBC
   _IO_funlockfile (stderr);
@@ -302,22 +235,10 @@ error (status, errnum, message, va_alist
 int error_one_per_line;
 
 void
-#if defined VA_START && __STDC__
 error_at_line (int status, int errnum, const char *file_name,
               unsigned int line_number, const char *message, ...)
-#else
-error_at_line (status, errnum, file_name, line_number, message, va_alist)
-     int status;
-     int errnum;
-     const char *file_name;
-     unsigned int line_number;
-     char *message;
-     va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   if (error_one_per_line)
     {
@@ -360,20 +281,8 @@ error_at_line (status, errnum, file_name
        fprintf (stderr, "%s:%d: ", file_name, line_number);
     }
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   error_tail (status, errnum, message, args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-
-  ++error_message_count;
-  if (errnum)
-    print_errno_message (errnum);
-  putc ('\n', stderr);
-  fflush (stderr);
-  if (status)
-    exit (status);
-#endif
 
 #ifdef _LIBC
   _IO_funlockfile (stderr);
Index: m4/error.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/error.m4,v
retrieving revision 1.12
diff -p -u -r1.12 error.m4
--- m4/error.m4 22 Apr 2003 03:28:22 -0000      1.12
+++ m4/error.m4 8 Sep 2003 23:20:51 -0000
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 AC_DEFUN([gl_ERROR],
 [
@@ -10,9 +10,6 @@ AC_DEFUN([gl_ERROR],
 # Prerequisites of lib/error.c.
 AC_DEFUN([jm_PREREQ_ERROR],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
   AC_REQUIRE([AC_FUNC_VPRINTF])
-  AC_CHECK_FUNCS(strerror)
-  AC_CHECK_DECLS([strerror])
   AC_FUNC_STRERROR_R
 ])