Changeset 285188 in webkit

Timestamp:

Nov 2, 2021, 3:19:22 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

[WTF] Minor clean-up for format-related functions
<​https://webkit.org/b/232514>

Reviewed by Yusuke Suzuki.

• wtf/Assertions.cpp:

(WTF::createWithFormatAndArguments):

• Put WTF_ATTRIBUTE_PRINTF() on its own line to match other functions.

(WTF::vprintf_stderr_with_prefix):
(WTF::vprintf_stderr_with_trailing_newline):

• Move ALLOW_NONLITERAL_FORMAT_{BEGIN,END} around specific function calls that need them.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Assertions.cpp (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-11-02  David Kilzer  <ddkilzer@apple.com>
+
+        [WTF] Minor clean-up for format-related functions
+        <https://webkit.org/b/232514>
+
+        Reviewed by Yusuke Suzuki.
+
+        * wtf/Assertions.cpp:
+        (WTF::createWithFormatAndArguments):
+        - Put WTF_ATTRIBUTE_PRINTF() on its own line to match other
+          functions.
+        (WTF::vprintf_stderr_with_prefix):
+        (WTF::vprintf_stderr_with_trailing_newline):
+        - Move ALLOW_NONLITERAL_FORMAT_{BEGIN,END} around specific
+          function calls that need them.
+
 2021-11-02  Michael Catanzaro  <mcatanzaro@gnome.org>
 

trunk/Source/WTF/wtf/Assertions.cpp

@@ -70 +70 @@
 namespace WTF {
 
-WTF_ATTRIBUTE_PRINTF(1, 0) static String createWithFormatAndArguments(const char* format, va_list args)
+WTF_ATTRIBUTE_PRINTF(1, 0)
+static String createWithFormatAndArguments(const char* format, va_list args)
 {
     va_list argsCopy;
@@ -183 +184 @@
 }
 
-ALLOW_NONLITERAL_FORMAT_BEGIN
-
 WTF_ATTRIBUTE_PRINTF(2, 0)
 static void vprintf_stderr_with_prefix(const char* prefix, const char* format, va_list args)
@@ -195 +194 @@
     formatWithPrefix[prefixLength + formatLength] = 0;
 
+    ALLOW_NONLITERAL_FORMAT_BEGIN
     vprintf_stderr_common(formatWithPrefix.data(), args);
+    ALLOW_NONLITERAL_FORMAT_END
 }
 
@@ -212 +213 @@
     formatWithNewline[formatLength + 1] = 0;
 
+    ALLOW_NONLITERAL_FORMAT_BEGIN
     vprintf_stderr_common(formatWithNewline.data(), args);
-}
-
-ALLOW_NONLITERAL_FORMAT_END
+    ALLOW_NONLITERAL_FORMAT_END
+}
 
 WTF_ATTRIBUTE_PRINTF(1, 2)