tests: link lib/libbison.a for gnulib.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 7428a4af2f50c95493116348e7d83930f5a94c7b..d187624d63b1762e4d30b12942a5b8baceb92a4f 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,12 +1,12 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2010 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
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+   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 Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
@@ -30,10 +28,6 @@
 #include "files.h"
 #include "getargs.h"
 
-/* The calling program should define program_name and set it to the
-   name of the executing program.  */
-extern char *program_name;
-
 bool complaint_issued;
 
 \f
@@ -62,7 +56,6 @@ error_message (location *loc,
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);
-  va_end (args);
   putc ('\n', stderr);
   fflush (stderr);
 }
@@ -73,6 +66,7 @@ error_message (location *loc,
   va_list args;                                        \
   va_start (args, Message);                    \
   error_message (Loc, Prefix, Message, args);  \
+  va_end (args);                               \
 }