mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 15:25:22 +00:00
Code Issues Releases Wiki Activity

checkpatch: Ignore macro definitions of FOR_EACH.

Browse Source 
When defining a FOR_EACH macro, checkpatch freaks out and generates a
control block whitespace error.  Create an exception so that it doesn't
generate errors for this case.

Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2020-August/373509.html
Reported-by: Toshiaki Makita <toshiaki.makita1@gmail.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Aaron Conole
2021-06-25 13:18:07 -04:00
committed by Ilya Maximets
parent 772a842fb5
commit b6c5f30cfa
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/checkpatch.at
View File

@@ -284,6 +284,11 @@ try_checkpatch \
+ for (init; condition; increment) { \\ + for (init; condition; increment) { \\
" "
try_checkpatch \
"COMMON_PATCH_HEADER
+#define SOME_FOR_EACH(a, b, c) /* Foo. */
"
AT_CLEANUP AT_CLEANUP

8
utilities/checkpatch.py
View File

@@ -157,6 +157,8 @@ __regex_trailing_whitespace = re.compile(r'[^\S]+$')
__regex_single_line_feed = re.compile(r'^\f$') __regex_single_line_feed = re.compile(r'^\f$')
__regex_for_if_missing_whitespace = re.compile(r' +(%s)[\(]' __regex_for_if_missing_whitespace = re.compile(r' +(%s)[\(]'
% __parenthesized_constructs) % __parenthesized_constructs)
__regex_hash_define_for_each = re.compile(
r'#define [_A-Z]+FOR_*EACH[_A-Z0-9]*\(')
__regex_for_if_too_much_whitespace = re.compile(r' +(%s) +[\(]' __regex_for_if_too_much_whitespace = re.compile(r' +(%s) +[\(]'
% __parenthesized_constructs) % __parenthesized_constructs)
__regex_for_if_parens_whitespace = \ __regex_for_if_parens_whitespace = \
@@ -245,8 +247,10 @@ def if_and_for_whitespace_checks(line):
""" """
if skip_block_whitespace_check: if skip_block_whitespace_check:
return True return True
if (__regex_for_if_missing_whitespace.search(line) is not None or if (__regex_for_if_missing_whitespace.search(line) is not None and
__regex_for_if_too_much_whitespace.search(line) is not None or __regex_hash_define_for_each.search(line) is None):
return False
if (__regex_for_if_too_much_whitespace.search(line) is not None or
__regex_for_if_parens_whitespace.search(line)): __regex_for_if_parens_whitespace.search(line)):
return False return False
return True return True