Changeset 54808 in webkit

Timestamp:

Feb 15, 2010 10:17:21 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-02-15 Martin Robinson <Martin Robinson>

Reviewed by Darin Adler.

check-webkit-style should not complain about NULL sentinel in calls to g_strconcat and g_strjoin
​https://bugs.webkit.org/show_bug.cgi?id=34834

• Scripts/webkitpy/style/processors/cpp.py:
• Scripts/webkitpy/style/processors/cpp_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/processors/cpp.py (modified) (1 diff)
• Scripts/webkitpy/style/processors/cpp_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-02-15  Martin Robinson  <mrobinson@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        check-webkit-style should not complain about NULL sentinel in calls to g_strconcat and g_strjoin
+        https://bugs.webkit.org/show_bug.cgi?id=34834
+
+        * Scripts/webkitpy/style/processors/cpp.py:
+        * Scripts/webkitpy/style/processors/cpp_unittest.py:
+
 2010-02-12  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/style/processors/cpp.py

@@ -1867 +1867 @@
     # Don't warn about NULL usage in g_object_{get,set}(). See Bug 32858
     if search(r'\bg_object_[sg]et\b', line):
+        return
+
+    # Don't warn about NULL usage in g_str{join,concat}(). See Bug 34834
+    if search(r'\bg_str(join|concat)\b', line):
         return
 

trunk/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py

@@ -3393 +3393 @@
             'foo.m')
 
-        # Make sure that the NULL check does not apply to g_object_{set,get}
+        # Make sure that the NULL check does not apply to g_object_{set,get} and
+        # g_str{join,concat}
         self.assert_lint(
             'g_object_get(foo, "prop", &bar, NULL);',
@@ -3399 +3400 @@
         self.assert_lint(
             'g_object_set(foo, "prop", bar, NULL);',
+            '')
+        self.assert_lint(
+            'gchar* result = g_strconcat("part1", "part2", "part3", NULL);',
+            '')
+        self.assert_lint(
+            'gchar* result = g_strconcat("part1", NULL);',
+            '')
+        self.assert_lint(
+            'gchar* result = g_strjoin(",", "part1", "part2", "part3", NULL);',
+            '')
+        self.assert_lint(
+            'gchar* result = g_strjoin(",", "part1", NULL);',
             '')