X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4b68955b1d17f85fd1d54a9b1ff16b156a93b7cf..927b425baae16fc1d50e092b78b944e281b521f6:/src/complain.c

diff --git a/src/complain.c b/src/complain.c
index 89b1ce5b..927dbb63 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,6 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2000, 2001, 2002, 2004, 2005 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
@@ -13,75 +14,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
+#include <config.h>
 #include "system.h"
 
 #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>
-#endif
 
 #include "complain.h"
 #include "files.h"
 
-#ifndef _
-# define _(String) String
-#endif
-
-#ifdef _LIBC
-/* In the GNU C library, there is a predefined variable for this.  */
-
-# define program_name program_invocation_name
-# include <errno.h>
-
-/* In GNU libc we want do not want to use the common name `error' directly.
-   Instead make it a weak alias.  */
-# define error __error
-# define error_at_line __error_at_line
-
-# ifdef USE_IN_LIBIO
-#  include <libio/iolibio.h>
-#  define fflush(s) _IO_fflush (s)
-# endif
-
-#else /* not _LIBC */
-
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 
-# if HAVE_STRERROR
-#  ifndef HAVE_DECL_STRERROR
-"this configure-time declaration test was not run"
-#  endif
-#  if !HAVE_DECL_STRERROR && !defined strerror
-char *strerror (int);
-#  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	/* not _LIBC */
-
 /* This variable is set each time `warn' is called.  */
 bool warning_issued;
 
@@ -94,12 +44,11 @@ bool complaint_issued;
 `--------------------------------*/
 
 void
-warn_at (location_t location, const char *message, ...)
+warn_at (location loc, const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
-  location_print (stderr, location);
+  location_print (stderr, loc);
   fputs (": ", stderr);
   fputs (_("warning: "), stderr);
 
@@ -109,7 +58,6 @@ warn_at (location_t location, const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 
 void
@@ -117,7 +65,6 @@ warn (const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
   fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
 
   va_start (args, message);
@@ -126,7 +73,6 @@ warn (const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 
 /*-----------------------------------------------------------.
@@ -134,12 +80,11 @@ warn (const char *message, ...)
 `-----------------------------------------------------------*/
 
 void
-complain_at (location_t location, const char *message, ...)
+complain_at (location loc, const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
-  location_print (stderr, location);
+  location_print (stderr, loc);
   fputs (": ", stderr);
 
   va_start (args, message);
@@ -148,7 +93,6 @@ complain_at (location_t location, const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 
 void
@@ -156,7 +100,6 @@ complain (const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   va_start (args, message);
@@ -165,7 +108,6 @@ complain (const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 
 /*-------------------------------------------------.
@@ -173,12 +115,11 @@ complain (const char *message, ...)
 `-------------------------------------------------*/
 
 void
-fatal_at (location_t location, const char *message, ...)
+fatal_at (location loc, const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
-  location_print (stderr, location);
+  location_print (stderr, loc);
   fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);
 
@@ -186,7 +127,6 @@ fatal_at (location_t location, const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
-  fflush (stderr);
   exit (EXIT_FAILURE);
 }
 
@@ -195,7 +135,6 @@ fatal (const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   fputs (_("fatal error: "), stderr);
@@ -204,6 +143,5 @@ fatal (const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
-  fflush (stderr);
   exit (EXIT_FAILURE);
 }