* src/struniq.h, src/struniq.c (struniq_t): Is const.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 44d486d40141de6b2f391aa8bc17211db23508f3..7d2f0c55646ec4571d77f89ef8f69c97a1f4e813 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -21,24 +21,14 @@
 
 #include "system.h"
 
-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# ifdef __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;
+#include <stdarg.h>
+#if ! (HAVE_VPRINTF || defined vfprintf)
+# define vfprintf(stream, message, args) _doprnt (message, args, stream)
 #endif
 
 #if STDC_HEADERS || _LIBC
 # include <stdlib.h>
 # include <string.h>
-#else
-void exit ();
 #endif
 
 #include "complain.h"
@@ -74,12 +64,11 @@ extern char *program_name;
 "this configure-time declaration test was not run"
 #  endif
 #  if !HAVE_DECL_STRERROR && !defined strerror
-char *strerror PARAMS ((int));
+char *strerror (int);
 #  endif
 # else
 static char *
-private_strerror (errnum)
-     int errnum;
+private_strerror (int errnum)
 {
   extern char *sys_errlist[];
   extern int sys_nerr;
@@ -92,11 +81,11 @@ private_strerror (errnum)
 # endif /* HAVE_STRERROR */
 #endif /* not _LIBC */
 
-/* This variable is incremented each time `warn' is called.  */
-unsigned int warn_message_count;
+/* This variable is set each time `warn' is called.  */
+bool warning_issued;
 
-/* This variable is incremented each time `complain' is called.  */
-unsigned int complain_message_count;
+/* This variable is set each time `complain' is called.  */
+bool complaint_issued;
 
 \f
 /*--------------------------------.
@@ -104,62 +93,37 @@ unsigned int complain_message_count;
 `--------------------------------*/
 
 void
-#if defined VA_START && defined __STDC__
 warn_at (location_t location, const char *message, ...)
-#else
-warn_at (location, message, va_alist)
-  location_t location
-  char *message;
-  va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);
   fputs (_("warning: "), stderr);
 
-#ifdef VA_START
-  VA_START (args, message);
+  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;
+  warning_issued = true;
   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: "));
+  fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
 
-#ifdef VA_START
-  VA_START (args, message);
+  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;
+  warning_issued = true;
   putc ('\n', stderr);
   fflush (stderr);
 }
@@ -169,61 +133,36 @@ warn (message, va_alist)
 `-----------------------------------------------------------*/
 
 void
-#if defined VA_START && defined __STDC__
 complain_at (location_t location, const char *message, ...)
-#else
-complain_at (location, message, va_alist)
-  location_t location;
-  char *message;
-  va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   vfprintf (stderr, message, args);
   va_end (args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
 
-  ++complain_message_count;
+  complaint_issued = true;
   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);
-  fprintf (stderr, "%s: ", infile ? infile : program_name);
+  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   vfprintf (stderr, message, args);
   va_end (args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
 
-  ++complain_message_count;
+  complaint_issued = true;
   putc ('\n', stderr);
   fflush (stderr);
 }
@@ -233,62 +172,37 @@ complain (message, va_alist)
 `-------------------------------------------------*/
 
 void
-#if defined VA_START && defined __STDC__
 fatal_at (location_t location, const char *message, ...)
-#else
-fatal_at (location, message, va_alist)
-  location_t location;
-  char *message;
-  va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   fflush (stdout);
   LOCATION_PRINT (stderr, location);
   fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   vfprintf (stderr, message, args);
   va_end (args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
   putc ('\n', stderr);
   fflush (stderr);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 void
-#if defined VA_START && defined __STDC__
 fatal (const char *message, ...)
-#else
-fatal (message, va_alist)
-     char *message;
-     va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   fflush (stdout);
-  fprintf (stderr, "%s: ", infile ? infile : program_name);
+  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   fputs (_("fatal error: "), stderr);
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   vfprintf (stderr, message, args);
   va_end (args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
   putc ('\n', stderr);
   fflush (stderr);
-  exit (1);
+  exit (EXIT_FAILURE);
 }