diff options
| author | Martin Roth <martinroth@google.com> | 2017-03-04 19:28:37 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-03-09 04:37:43 +0100 |
| commit | 010905ed2fdaea92116f5d2764073176c06dce31 (patch) | |
| tree | 0b1517dc41d48f89939c1b8c61999f167373525c | |
| parent | 2e17eaed1bfb2e6362790b4a7590c48c6602a8bf (diff) | |
uti/lint/checkpatch: Fix __attribute__ struct errors for OPEN_BRACE
The __attribute__((weak)) lines on structs were being read as functions,
causing a warning that the brace should be on the next line.
Add a check to see if it's a struct with an attribute, and ignore it for
the OPEN_BRACE check if it is.
Change-Id: Ieb0c96027e8df842f60ca7c9de7aac941eed1dc2
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/18570
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Lee Leahy <leroy.p.leahy@intel.com>
| -rwxr-xr-x | util/lint/checkpatch.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl index 031aa34c82..9afa2324b5 100755 --- a/util/lint/checkpatch.pl +++ b/util/lint/checkpatch.pl @@ -3736,6 +3736,7 @@ sub process { # function brace can't be on same line, except for #defines of do while, # or if closed on same line if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and + ($line!~/struct.*__attribute__\(\(.*\)\)/) and !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) { if (ERROR("OPEN_BRACE", "open brace '{' following function declarations go on the next line\n" . $herecurr) && |