2007-11-24 Laszlo Gombos <laszlo.gombos@gmail.com>

        Reviewed by Sam Weinig.

        Add printf format attribute to several functions. Use the the new WTF_ATTRIBUTE_PRINTF define.

        * dom/XMLTokenizer.cpp:
        * dom/XMLTokenizer.h:
        * platform/DeprecatedString.h:
        * platform/PlatformString.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3ee03ec80d7fa1bb4394bb4118a8fb4f5e8ef450..66b6b819a61fef474b8d1bd53f25bfe6eef260e7 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-24  Laszlo Gombos  <laszlo.gombos@gmail.com>
+
+        Reviewed by Sam Weinig.
+
+        Add printf format attribute to several functions. Use the the new WTF_ATTRIBUTE_PRINTF define.
+
+        * dom/XMLTokenizer.cpp:
+        * dom/XMLTokenizer.h:
+        * platform/DeprecatedString.h:
+        * platform/PlatformString.h:
+
 2007-11-25  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/WebCore/dom/XMLTokenizer.cpp b/WebCore/dom/XMLTokenizer.cpp
index 65fe4a6b0d777619bd88bdfceb08d0c0cd652b66..6e64a1127325cc766981193e6f7986ab68aee300 100644 (file)
--- a/WebCore/dom/XMLTokenizer.cpp
+++ b/WebCore/dom/XMLTokenizer.cpp
@@ -1065,6 +1065,7 @@ static void commentHandler(void* closure, const xmlChar* comment)
     getTokenizer(closure)->comment(comment);
 }
 
+WTF_ATTRIBUTE_PRINTF(2, 3)
 static void warningHandler(void* closure, const char* message, ...)
 {
     va_list args;
@@ -1073,6 +1074,7 @@ static void warningHandler(void* closure, const char* message, ...)
     va_end(args);
 }
 
+WTF_ATTRIBUTE_PRINTF(2, 3)
 static void fatalErrorHandler(void* closure, const char* message, ...)
 {
     va_list args;
@@ -1081,6 +1083,7 @@ static void fatalErrorHandler(void* closure, const char* message, ...)
     va_end(args);
 }
 
+WTF_ATTRIBUTE_PRINTF(2, 3)
 static void normalErrorHandler(void* closure, const char* message, ...)
 {
     va_list args;
@@ -1550,6 +1553,7 @@ static void balancedCommentHandler(void* closure, const xmlChar* comment)
     static_cast<XMLTokenizer*>(closure)->comment(comment);
 }
 
+WTF_ATTRIBUTE_PRINTF(2, 3)
 static void balancedWarningHandler(void* closure, const char* message, ...)
 {
     va_list args;

diff --git a/WebCore/dom/XMLTokenizer.h b/WebCore/dom/XMLTokenizer.h
index 26f40cbf515f8575f24ee6fe9c9df8215bd0408e..4164d7ac8d1b93a5f85f8bd6ddec3bb922aae9aa 100644 (file)
--- a/WebCore/dom/XMLTokenizer.h
+++ b/WebCore/dom/XMLTokenizer.h
@@ -84,7 +84,7 @@ namespace WebCore {
 
 #ifndef USE_QXMLSTREAM
         // callbacks from parser SAX
-        void error(ErrorType, const char* message, va_list args);
+        void error(ErrorType, const char* message, va_list args) WTF_ATTRIBUTE_PRINTF(3, 0); 
         void startElementNs(const xmlChar* xmlLocalName, const xmlChar* xmlPrefix, const xmlChar* xmlURI, int nb_namespaces,
                             const xmlChar** namespaces, int nb_attributes, int nb_defaulted, const xmlChar** libxmlAttributes);
         void endElementNs();

diff --git a/WebCore/platform/DeprecatedString.h b/WebCore/platform/DeprecatedString.h
index fc5f4676f0236189c2ea47e67efb83ef3e142961..c4131347c0d9d2974f5a92c94285e52b0ef663cf 100644 (file)
--- a/WebCore/platform/DeprecatedString.h
+++ b/WebCore/platform/DeprecatedString.h
@@ -385,11 +385,7 @@ public:
     DeprecatedString &setNum(unsigned long);
     DeprecatedString &setNum(double);
 
-    DeprecatedString& format(const char *, ...) 
-#if __GNUC__
-    __attribute__ ((format (printf, 2, 3)))
-#endif
-    ;
+    DeprecatedString& format(const char *, ...) WTF_ATTRIBUTE_PRINTF(2, 3);
 
     DeprecatedString &append(const DeprecatedString &);
     DeprecatedString &append(DeprecatedChar);

diff --git a/WebCore/platform/PlatformString.h b/WebCore/platform/PlatformString.h
index 2f21bb19009326f8e39a142a9b874b1c0af64f05..48a8ade43951b040c1dc4bb1e9978900b687cb11 100644 (file)
--- a/WebCore/platform/PlatformString.h
+++ b/WebCore/platform/PlatformString.h
@@ -133,11 +133,7 @@ public:
     static String number(unsigned long long);
     static String number(double);
     
-    static String format(const char *, ...)
-#if __GNUC__
-        __attribute__ ((format (printf, 1, 2)))
-#endif
-        ;
+    static String format(const char *, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
 
     Vector<String> split(const String& separator, bool allowEmptyEntries = false) const;
     Vector<String> split(UChar separator, bool allowEmptyEntries = false) const;