portability: use va_start and va_end in the same function.

* src/complain.c (error_message): Move va_end from here...
(ERROR_MESSAGE): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 45bfbb971e27c021ebf2f561193596aeaa80860f..a0e138d0bc2ee57d8d0ad7c6714fae40c0713d27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-11  Joel E. Denny  <jdenny@clemson.edu>
+
+       portability: use va_start and va_end in the same function.
+       * src/complain.c (error_message): Move va_end from here...
+       (ERROR_MESSAGE): ... to here.
+

 2009-10-08  Joel E. Denny  <jdenny@clemson.edu>
 
        * data/bison.m4: Update comments for rename to muscle-tab.h.
 2009-10-08  Joel E. Denny  <jdenny@clemson.edu>
 
        * data/bison.m4: Update comments for rename to muscle-tab.h.

diff --git a/src/complain.c b/src/complain.c
index 7bb22de00091478af7cc23d66d0ed62799778013..63dfc935143830a3a1874941c48c3a5a1990a2b6 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -68,7 +68,6 @@ error_message (location *loc,
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);

-  va_end (args);

   putc ('\n', stderr);
   fflush (stderr);
 }
   putc ('\n', stderr);
   fflush (stderr);
 }


@@ -79,6 +78,7 @@ error_message (location *loc,
   va_list args;                                        \
   va_start (args, Message);                    \
   error_message (Loc, Prefix, Message, args);  \
   va_list args;                                        \
   va_start (args, Message);                    \
   error_message (Loc, Prefix, Message, args);  \

+  va_end (args);                               \

 }
 
 
 }