Minor textual fixes.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 7d2f0c55646ec4571d77f89ef8f69c97a1f4e813..e14f40b6165898b4941f6aa8677143292662dc58 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002  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
@@ -26,47 +26,25 @@
 # 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
+#if HAVE_STRERROR
+# ifndef HAVE_DECL_STRERROR
 "this configure-time declaration test was not run"
-#  endif
-#  if !HAVE_DECL_STRERROR && !defined strerror
+# endif
+# if !HAVE_DECL_STRERROR && !defined strerror
 char *strerror (int);
-#  endif
-# else
+# endif
+#else
 static char *
 private_strerror (int errnum)
 {
@@ -77,9 +55,8 @@ private_strerror (int errnum)
     return _(sys_errlist[errnum]);
   return _("Unknown system error");
 }
-#  define strerror private_strerror
-# endif /* HAVE_STRERROR */
-#endif /* not _LIBC */
+# define strerror private_strerror
+#endif /* HAVE_STRERROR */
 
 /* This variable is set each time `warn' is called.  */
 bool warning_issued;
@@ -93,12 +70,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);
 
@@ -108,7 +84,6 @@ warn_at (location_t location, const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 
 void
@@ -116,7 +91,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);
@@ -125,7 +99,6 @@ warn (const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 \f
 /*-----------------------------------------------------------.
@@ -133,12 +106,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);
@@ -147,7 +119,6 @@ complain_at (location_t location, const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 
 void
@@ -155,7 +126,6 @@ complain (const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   va_start (args, message);
@@ -164,7 +134,6 @@ complain (const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
-  fflush (stderr);
 }
 \f
 /*-------------------------------------------------.
@@ -172,12 +141,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);
 
@@ -185,7 +153,6 @@ fatal_at (location_t location, const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
-  fflush (stderr);
   exit (EXIT_FAILURE);
 }
 
@@ -194,7 +161,6 @@ fatal (const char *message, ...)
 {
   va_list args;
 
-  fflush (stdout);
   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   fputs (_("fatal error: "), stderr);
@@ -203,6 +169,5 @@ fatal (const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
-  fflush (stderr);
   exit (EXIT_FAILURE);
 }