diff options
author | Aaron Conole <aconole@redhat.com> | 2017-05-01 16:14:05 -0400 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2017-05-01 13:24:53 -0700 |
commit | 907848bdd9a48a03e9f59294f3a704de0b078044 (patch) | |
tree | 04531d0505d4460250db9fc35a63d17598b9f972 /utilities | |
parent | a84a1edb33b3230fc915c922b1af8c6621e7bea5 (diff) | |
download | openvswitch-907848bdd9a48a03e9f59294f3a704de0b078044.tar.gz |
checkpatch: move the checks to the framework
All of the checks are now part of the new 'check' framework.
Signed-off-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'utilities')
-rwxr-xr-x | utilities/checkpatch.py | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py index 30c0a3e07..d22ccc38b 100755 --- a/utilities/checkpatch.py +++ b/utilities/checkpatch.py @@ -177,7 +177,32 @@ checks = [ lambda x: not any([fmt in x for fmt in line_length_blacklist]), 'check': lambda x: line_length_check(x), 'print': - lambda x: print_warning("Line is greater than 79-characters long", x)} + lambda x: print_warning("Line is greater than 79-characters long", x)}, + + {'regex': '$(?<!\.mk)', + 'match_name': None, + 'check': lambda x: not leading_whitespace_is_spaces(x), + 'print': + lambda x: print_warning("Line has non-spaces leading whitespace", x)}, + + {'regex': None, 'match_name': None, + 'check': lambda x: trailing_whitespace_or_crlf(x), + 'print': lambda x: print_warning("Line has trailing whitespace", x)}, + + {'regex': '(.c|.h)(.in)?$', 'match_name': None, + 'check': lambda x: not if_and_for_whitespace_checks(x), + 'print': lambda x: print_error("Improper whitespace around control block", + x)}, + + {'regex': '(.c|.h)(.in)?$', 'match_name': None, + 'check': lambda x: not if_and_for_end_with_bracket_check(x), + 'print': lambda x: print_error("Inappropriate bracing around statement", + x)}, + + {'regex': '(.c|.h)(.in)?$', 'match_name': None, + 'check': lambda x: pointer_whitespace_check(x), + 'print': + lambda x: print_error("Inappropriate spacing in pointer declaration", x)} ] @@ -285,21 +310,7 @@ def ovs_checkpatch_parse(text): # linux or windows coding standards if '/datapath' in current_file: continue - if (not current_file.endswith('.mk') and - not leading_whitespace_is_spaces(cmp_line)): - print_warning("Line has non-spaces leading whitespace", - lineno) run_checks(current_file, cmp_line, lineno) - if trailing_whitespace_or_crlf(cmp_line): - print_warning("Line has trailing whitespace", lineno) - if not if_and_for_whitespace_checks(cmp_line): - print_error("Improper whitespace around control block", - lineno) - if not if_and_for_end_with_bracket_check(cmp_line): - print_error("Inappropriate bracing around statement", lineno) - if pointer_whitespace_check(cmp_line): - print_error("Inappropriate spacing in pointer declaration", - lineno) if __errors or __warnings: return -1 return 0 |