texinfo/makeinfo xml.c

[Sergey Poznyakoff]

CVSROOT:        /cvsroot/texinfo
Module name:    texinfo
Changes by:     Sergey Poznyakoff <gray>        11/04/06 21:22:04

Modified files:
        makeinfo       : xml.c 

Log message:
        (xml_insert_element_with_attribute): Use C99 stdarg.
        (xml_insert_element_with_attribute): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/makeinfo/xml.c?cvsroot=texinfo&r1=1.75&r2=1.76

Patches:
Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- xml.c       31 Jan 2008 18:33:27 -0000      1.75
+++ xml.c       6 Apr 2011 21:22:03 -0000       1.76
@@ -1,5 +1,5 @@
 /* xml.c -- xml output, both TexinfoML and Docbook.
-   $Id: xml.c,v 1.75 2008/01/31 18:33:27 karl Exp $
+   $Id: xml.c,v 1.76 2011/04/06 21:22:03 gray Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
@@ -821,15 +821,7 @@
    barfs because `element' is a typedef declared near the beginning of
    this file.  */
 void
-#if defined (VA_FPRINTF) && __STDC__
 xml_insert_element_with_attribute (int elt, int arg, char *format, ...)
-#else
-xml_insert_element_with_attribute (elt, arg, format, va_alist)
-     int elt;
-     int arg;
-     char *format;
-     va_dcl
-#endif
 {
   /* Look at the replace_elements table to see if we have to change the 
element */
   if (xml_sort_index)
@@ -998,16 +990,10 @@
   if (format)
     {
       char temp_string[2000]; /* xx no fixed limits */
-#ifdef VA_SPRINTF
       va_list ap;
-#endif
 
-      VA_START (ap, format);
-#ifdef VA_SPRINTF
-      VA_SPRINTF (temp_string, format, ap);
-#else
-      sprintf (temp_string, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
+      va_start (ap, format);
+      vsnprintf (temp_string, sizeof (temp_string), format, ap);
       insert (' ');
       insert_string (temp_string);
       va_end (ap);