summaryrefslogtreecommitdiff
path: root/utilities
diff options
context:
space:
mode:
authorIlya Maximets <i.maximets@samsung.com>2019-01-18 17:46:04 +0300
committerBen Pfaff <blp@ovn.org>2019-01-18 09:21:25 -0800
commitb48aa1437df1d438d39d7c798ef93e0854911022 (patch)
treeef415344b76a6d1375232b580538b10e4dc71a58 /utilities
parent74920866f45e155cd8cb9ae3e183f0e9d3c7e0ed (diff)
downloadopenvswitch-b48aa1437df1d438d39d7c798ef93e0854911022.tar.gz
checkpatch: Check for C99 style comments.
Coding-style document asks not to use C99 ( '//' ) comments. Acked-by: Aaron Conole <aconole@redhat.com> Signed-off-by: Ilya Maximets <i.maximets@samsung.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'utilities')
-rwxr-xr-xutilities/checkpatch.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py
index 57ef5e6f3..8eab31f60 100755
--- a/utilities/checkpatch.py
+++ b/utilities/checkpatch.py
@@ -163,6 +163,7 @@ __regex_ends_with_bracket = \
__regex_ptr_declaration_missing_whitespace = re.compile(r'[a-zA-Z0-9]\*[^*]')
__regex_is_comment_line = re.compile(r'^\s*(/\*|\*\s)')
__regex_has_comment = re.compile(r'.*(/\*|\*\s)')
+__regex_has_c99_comment = re.compile(r'.*//.*$')
__regex_trailing_operator = re.compile(r'^[^ ]* [^ ]*[?:]$')
__regex_conditional_else_bracing = re.compile(r'^\s*else\s*{?$')
__regex_conditional_else_bracing2 = re.compile(r'^\s*}\selse\s*$')
@@ -298,6 +299,11 @@ def has_comment(line):
return __regex_has_comment.match(line) is not None
+def has_c99_comment(line):
+ """Returns TRUE if the current line contains C99 style comment (//)."""
+ return __regex_has_c99_comment.match(line) is not None
+
+
def trailing_operator(line):
"""Returns TRUE if the current line ends with an operatorsuch as ? or :"""
return __regex_trailing_operator.match(line) is not None
@@ -546,6 +552,11 @@ checks = [
'print': lambda: print_warning("Comment with 'xxx' marker")},
{'regex': r'(\.c|\.h)(\.in)?$', 'match_name': None,
+ 'prereq': lambda x: not is_comment_line(x),
+ 'check': lambda x: has_c99_comment(x),
+ 'print': lambda: print_error("C99 style comment")},
+
+ {'regex': r'(\.c|\.h)(\.in)?$', 'match_name': None,
'prereq': lambda x: has_comment(x),
'check': lambda x: check_comment_spelling(x)},