merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index c9c1f3a6b82e868411a045641d25418bf7c3f466..ae00e32ee2c43b72b2cb5f3ac80d336843d15c9a 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-01  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * libiberty.h (vsnprintf): Add format attribute.
+
 2005-05-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * ansidecl.h: Add ATTRIBUTE_FPTR_PRINTF.

diff --git a/include/libiberty.h b/include/libiberty.h
index 75cbedc23dd468ed4b47e3e8d2429b200fe1c7a7..a9a75eaa8ec7720115f8518e00478a37f0a0a6bc 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -527,8 +527,7 @@ extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
 /* Like vsprintf but provides a pointer to malloc'd storage, which
    must be freed by the caller.  */
 
-extern int vasprintf (char **, const char *, va_list)
-  ATTRIBUTE_PRINTF(2,0);
+extern int vasprintf (char **, const char *, va_list) ATTRIBUTE_PRINTF(2,0);
 #endif
 
 #if defined(HAVE_DECL_SNPRINTF) && !HAVE_DECL_SNPRINTF
@@ -538,7 +537,7 @@ extern int snprintf (char *, size_t, const char *, ...) ATTRIBUTE_PRINTF_3;
 
 #if defined(HAVE_DECL_VSNPRINTF) && !HAVE_DECL_VSNPRINTF
 /* Like vsprintf but prints at most N characters.  */
-extern int vsnprintf (char *, size_t, const char *, va_list);
+extern int vsnprintf (char *, size_t, const char *, va_list) ATTRIBUTE_PRINTF(3,0);
 #endif
 
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))