(lbitset_bytes): Use size_t, not unsigned int, to count bytes.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 8f27b37806abbc5448ba78c8cb5d729952094ba9..44d486d40141de6b2f391aa8bc17211db23508f3 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* 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
@@ -41,18 +41,8 @@
 void exit ();
 #endif
 
-/* To get error_one_per_line. */
-#include "error.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
@@ -79,14 +69,14 @@ char *strerror_r ();
    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
-#  if HAVE_STRERROR
-#   ifndef strerror            /* On some systems, strerror is a macro */
-char *strerror ();
-#   endif
-#  else
 static char *
 private_strerror (errnum)
      int errnum;
@@ -98,9 +88,8 @@ private_strerror (errnum)
     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.  */
@@ -128,25 +117,40 @@ warn_at (location, message, va_alist)
   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);
   fputs (_("warning: "), stderr);
 
+#ifdef VA_START
+  VA_START (args, message);
+  vfprintf (stderr, message, args);
+  va_end (args);
+#else
+  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+
+  ++warn_message_count;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
+
+void
+#if defined VA_START && defined __STDC__
+warn (const char *message, ...)
+#else
+warn (message, va_alist)
+  char *message;
+  va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  fflush (stdout);
+  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
+
 #ifdef VA_START
   VA_START (args, message);
   vfprintf (stderr, message, args);
@@ -178,23 +182,38 @@ complain_at (location, message, va_alist)
   va_list args;
 #endif
 
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
+  fflush (stdout);
+  LOCATION_PRINT (stderr, location);
+  fputs (": ", stderr);
 
-      if (old_lineno == location.first_line &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
+#ifdef VA_START
+  VA_START (args, message);
+  vfprintf (stderr, message, args);
+  va_end (args);
+#else
+  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
 
-      old_infile = infile;
-      old_lineno = location.first_line;
-    }
+  ++complain_message_count;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
+
+void
+#if defined VA_START && defined __STDC__
+complain (const char *message, ...)
+#else
+complain (message, va_alist)
+     char *message;
+     va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
 
   fflush (stdout);
-  LOCATION_PRINT (stderr, location);
-  fputs (": ", stderr);
+  fprintf (stderr, "%s: ", infile ? infile : program_name);
 
 #ifdef VA_START
   VA_START (args, message);
@@ -217,7 +236,7 @@ void
 #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