diff options
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/style/checkers/cpp.py')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/style/checkers/cpp.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py b/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py index 3e787d6..a77bff0 100644 --- a/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py +++ b/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py @@ -1868,8 +1868,12 @@ def check_for_null(file_extension, clean_lines, line_number, error): line = clean_lines.elided[line_number] - # Don't warn about NULL usage in g_object_{get,set}(). See Bug 32858 - if search(r'\bg_object_[sg]et\b', line): + # Don't warn about NULL usage in g_*(). See Bug 32858 and 39372. + if search(r'\bg(_[a-z]+)+\b', line): + return + + # Don't warn about NULL usage in gst_*_many(). See Bug 39740 + if search(r'\bgst_\w+_many\b', line): return # Don't warn about NULL usage in g_str{join,concat}(). See Bug 34834 |