texinfo/makeinfo xml.h html.c

[Sergey Poznyakoff]

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

Modified files:
        makeinfo       : xml.h html.c 

Log message:
        Update

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/makeinfo/xml.h?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/makeinfo/html.c?cvsroot=texinfo&r1=1.42&r2=1.43

Patches:
Index: xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- xml.h       31 Jan 2008 18:33:28 -0000      1.32
+++ xml.h       6 Apr 2011 21:32:42 -0000       1.33
@@ -1,5 +1,5 @@
 /* xml.h -- xml (including Docbook) output declarations.
-   $Id: xml.h,v 1.32 2008/01/31 18:33:28 karl Exp $
+   $Id: xml.h,v 1.33 2011/04/06 21:32:42 gray Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008
    Free Software Foundation, Inc.
@@ -150,10 +150,7 @@
 extern int xml_current_stack_index (void),
   xml_element (char *name);
 
-#if defined (VA_FPRINTF) && __STDC__
-void xml_insert_element_with_attribute (int elt, int arg, char *format, ...);
-#else
-void xml_insert_element_with_attribute ();
-#endif
+void xml_insert_element_with_attribute (int elt, int arg, char *format, ...)
+  TEXINFO_PRINTFLIKE(3,4);
 
 #endif /* XML_H */

Index: html.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- html.c      19 May 2008 18:26:47 -0000      1.42
+++ html.c      6 Apr 2011 21:32:42 -0000       1.43
@@ -1,5 +1,5 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.42 2008/05/19 18:26:47 karl Exp $
+   $Id: html.c,v 1.43 2011/04/06 21:32:42 gray Exp $
 
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
@@ -496,15 +496,7 @@
 
 /* Open or close TAG according to START_OR_END. */
 void
-#if defined (VA_FPRINTF) && __STDC__
 insert_html_tag_with_attribute (int start_or_end, char *tag, char *format, ...)
-#else
-insert_html_tag_with_attribute (start_or_end, tag, format, va_alist)
-     int start_or_end;
-     char *tag;
-     char *format;
-     va_dcl
-#endif
 {
   char *old_tag = NULL;
   char *old_attribs = NULL;
@@ -523,16 +515,10 @@
   
   if (format)
     {
-#ifdef VA_SPRINTF
       va_list ap;
-#endif
 
-      VA_START (ap, format);
-#ifdef VA_SPRINTF
-      VA_SPRINTF (formatted_attribs, format, ap);
-#else
-      sprintf (formatted_attribs, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
+      va_start (ap, format);
+      vsnprintf (formatted_attribs, sizeof (formatted_attribs), format, ap);
       va_end (ap);
     }
   else