Fix push parsing memory leak reported by Brandon Lucia at

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index e14f40b6165898b4941f6aa8677143292662dc58..910b41100b8d0a92a1be452db3c26f772d80d9bc 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

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


@@ -13,94 +15,94 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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>.  */
 
    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>
 #include "system.h"
 
 #include <stdarg.h>

-#if ! (HAVE_VPRINTF || defined vfprintf)
-# define vfprintf(stream, message, args) _doprnt (message, args, stream)
-#endif

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

+#include "getargs.h"
+
+bool complaint_issued;
+
+\f

 
 

-#ifndef _
-# define _(String) String
-#endif
-
-/* 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)
+/** Report an error message.
+ *
+ * \param loc     the location, defaulting to the current file,
+ *                or the program name.
+ * \param prefix  put before the message (e.g., "warning").
+ * \param message the error message, a printf format string.
+ * \param args    the arguments of the format string.
+ */
+static
+void
+error_message (location *loc,
+              const char *prefix,
+              const char *message, va_list args)

 {
 {

-  extern char *sys_errlist[];
-  extern int sys_nerr;
+  if (loc)
+    location_print (stderr, *loc);
+  else
+    fputs (current_file ? current_file : program_name, stderr);
+  fputs (": ", stderr);
+
+  if (prefix)
+    fprintf (stderr, "%s: ", prefix);

 
 

-  if (errnum > 0 && errnum <= sys_nerr)
-    return _(sys_errlist[errnum]);
-  return _("Unknown system error");
+  vfprintf (stderr, message, args);
+  va_end (args);
+  putc ('\n', stderr);
+  fflush (stderr);

 }
 }

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

 
 

-/* This variable is set each time `warn' is called.  */
-bool warning_issued;
+/** Wrap error_message() with varargs handling. */
+#define ERROR_MESSAGE(Loc, Prefix, Message)    \
+{                                              \
+  va_list args;                                        \
+  va_start (args, Message);                    \
+  error_message (Loc, Prefix, Message, args);  \
+}

 
 

-/* This variable is set each time `complain' is called.  */
-bool complaint_issued;

 
 

-\f

 /*--------------------------------.
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
 /*--------------------------------.
 | Report a warning, and proceed.  |
 `--------------------------------*/
 

+static void
+set_warning_issued (void)
+{
+  static bool warning_issued = false;
+  if (!warning_issued && (warnings_flag & warnings_error))
+    {
+      fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
+      complaint_issued = true;
+    }
+  warning_issued = true;
+}
+

 void
 warn_at (location loc, const char *message, ...)
 {
 void
 warn_at (location loc, const char *message, ...)
 {

-  va_list args;
-
-  location_print (stderr, loc);
-  fputs (": ", stderr);
-  fputs (_("warning: "), stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-
-  warning_issued = true;
-  putc ('\n', stderr);
+  set_warning_issued ();
+  ERROR_MESSAGE (&loc, _("warning"), message);

 }
 
 void
 warn (const char *message, ...)
 {
 }
 
 void
 warn (const char *message, ...)
 {

-  va_list args;
+  set_warning_issued ();
+  ERROR_MESSAGE (NULL, _("warning"), message);
+}

 
 

-  fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));

 
 

-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-
-  warning_issued = true;
-  putc ('\n', stderr);
-}
-\f

 /*-----------------------------------------------------------.
 | An error has occurred, but we can proceed, and die later.  |
 `-----------------------------------------------------------*/
 /*-----------------------------------------------------------.
 | An error has occurred, but we can proceed, and die later.  |
 `-----------------------------------------------------------*/


@@ -108,34 +110,18 @@ warn (const char *message, ...)
 void
 complain_at (location loc, const char *message, ...)
 {
 void
 complain_at (location loc, const char *message, ...)
 {

-  va_list args;
-
-  location_print (stderr, loc);
-  fputs (": ", stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-
+  ERROR_MESSAGE (&loc, NULL, message);

   complaint_issued = true;
   complaint_issued = true;

-  putc ('\n', stderr);

 }
 
 void
 complain (const char *message, ...)
 {
 }
 
 void
 complain (const char *message, ...)
 {

-  va_list args;
-
-  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-
+  ERROR_MESSAGE (NULL, NULL, message);

   complaint_issued = true;
   complaint_issued = true;

-  putc ('\n', stderr);

 }
 }

-\f
+
+

 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
 `-------------------------------------------------*/
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
 `-------------------------------------------------*/


@@ -143,31 +129,13 @@ complain (const char *message, ...)
 void
 fatal_at (location loc, const char *message, ...)
 {
 void
 fatal_at (location loc, const char *message, ...)
 {

-  va_list args;
-
-  location_print (stderr, loc);
-  fputs (": ", stderr);
-  fputs (_("fatal error: "), stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-  putc ('\n', stderr);
+  ERROR_MESSAGE (&loc, _("fatal error"), message);

   exit (EXIT_FAILURE);
 }
 
 void
 fatal (const char *message, ...)
 {
   exit (EXIT_FAILURE);
 }
 
 void
 fatal (const char *message, ...)
 {

-  va_list args;
-
-  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
-
-  fputs (_("fatal error: "), stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-  putc ('\n', stderr);
+  ERROR_MESSAGE (NULL, _("fatal error"), message);

   exit (EXIT_FAILURE);
 }
   exit (EXIT_FAILURE);
 }