* m4/prereq.m4: Update, from Coreutils 4.5.1.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 579cdf86c6389a3e6a991cb7807700342c31fc31..44d486d40141de6b2f391aa8bc17211db23508f3 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002  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
 
    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


@@ -41,18 +41,8 @@
 void exit ();
 #endif
 
 void exit ();
 #endif
 

-/* To get error_one_per_line. */
-#include "error.h"
-

 #include "complain.h"
 
 #include "complain.h"
 

-#ifndef HAVE_DECL_STRERROR_R
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_STRERROR_R
-char *strerror_r ();
-#endif
-

 #ifndef _
 # define _(String) String
 #endif
 #ifndef _
 # define _(String) String
 #endif


@@ -79,14 +69,14 @@ char *strerror_r ();
    name of the executing program.  */
 extern char *program_name;
 
    name of the executing program.  */
 extern char *program_name;
 

-# ifdef HAVE_STRERROR_R
-#  define __strerror_r strerror_r
+# if HAVE_STRERROR
+#  ifndef HAVE_DECL_STRERROR
+"this configure-time declaration test was not run"
+#  endif
+#  if !HAVE_DECL_STRERROR && !defined strerror
+char *strerror PARAMS ((int));
+#  endif

 # else
 # else

-#  if HAVE_STRERROR
-#   ifndef strerror            /* On some systems, strerror is a macro */
-char *strerror ();
-#   endif
-#  else

 static char *
 private_strerror (errnum)
      int errnum;
 static char *
 private_strerror (errnum)
      int errnum;


@@ -98,9 +88,8 @@ private_strerror (errnum)
     return _(sys_errlist[errnum]);
   return _("Unknown system error");
 }
     return _(sys_errlist[errnum]);
   return _("Unknown system error");
 }

-#   define strerror private_strerror
-#  endif /* HAVE_STRERROR */
-# endif        /* HAVE_STRERROR_R */
+#  define strerror private_strerror
+# endif /* HAVE_STRERROR */

 #endif /* not _LIBC */
 
 /* This variable is incremented each time `warn' is called.  */
 #endif /* not _LIBC */
 
 /* This variable is incremented each time `warn' is called.  */


@@ -128,20 +117,6 @@ warn_at (location, message, va_alist)
   va_list args;
 #endif
 
   va_list args;
 #endif
 

-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == location.first_line &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = location.first_line;
-    }
-

   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);
   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);


@@ -160,41 +135,21 @@ warn_at (location, message, va_alist)
   fflush (stderr);
 }
 
   fflush (stderr);
 }
 

-

 void
 #if defined VA_START && defined __STDC__
 warn (const char *message, ...)
 #else
 warn (message, va_alist)
 void
 #if defined VA_START && defined __STDC__
 warn (const char *message, ...)
 #else
 warn (message, va_alist)

-     char *message;
-     va_dcl
+  char *message;
+  va_dcl

 #endif
 {
 #ifdef VA_START
   va_list args;
 #endif
 
 #endif
 {
 #ifdef VA_START
   va_list args;
 #endif
 

-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == lineno &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = lineno;
-    }
-

   fflush (stdout);
   fflush (stdout);

-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-  fputs (_("warning: "), stderr);
+  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));

 
 #ifdef VA_START
   VA_START (args, message);
 
 #ifdef VA_START
   VA_START (args, message);


@@ -227,20 +182,6 @@ complain_at (location, message, va_alist)
   va_list args;
 #endif
 
   va_list args;
 #endif
 

-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == location.first_line &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = location.first_line;
-    }
-

   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);
   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);


@@ -258,7 +199,6 @@ complain_at (location, message, va_alist)
   fflush (stderr);
 }
 
   fflush (stderr);
 }
 

-

 void
 #if defined VA_START && defined __STDC__
 complain (const char *message, ...)
 void
 #if defined VA_START && defined __STDC__
 complain (const char *message, ...)


@@ -272,25 +212,8 @@ complain (message, va_alist)
   va_list args;
 #endif
 
   va_list args;
 #endif
 

-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == lineno &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = lineno;
-    }
-

   fflush (stdout);
   fflush (stdout);

-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
+  fprintf (stderr, "%s: ", infile ? infile : program_name);

 
 #ifdef VA_START
   VA_START (args, message);
 
 #ifdef VA_START
   VA_START (args, message);


@@ -313,7 +236,7 @@ void
 #if defined VA_START && defined __STDC__
 fatal_at (location_t location, const char *message, ...)
 #else
 #if defined VA_START && defined __STDC__
 fatal_at (location_t location, const char *message, ...)
 #else

-fatal (location, message, va_alist)
+fatal_at (location, message, va_alist)

   location_t location;
   char *message;
   va_dcl
   location_t location;
   char *message;
   va_dcl


@@ -354,10 +277,7 @@ fatal (message, va_alist)
 #endif
 
   fflush (stdout);
 #endif
 
   fflush (stdout);

-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
+  fprintf (stderr, "%s: ", infile ? infile : program_name);

 
   fputs (_("fatal error: "), stderr);
 
 
   fputs (_("fatal error: "), stderr);