checkpatch: don't match against empty $const_structs

Message ID 1476951126-30414-1-git-send-email-jerome.forissier@linaro.org
State New
Headers show

Commit Message

Jerome Forissier Oct. 20, 2016, 8:12 a.m.
When $conststructsfile does not exist or is empty, we may get false
warnings such as:
WARNING: struct  should normally be const

Fix that by not running the string match if $const_structs is empty.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

---
 scripts/checkpatch.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.7.4

Comments

Joe Perches Oct. 20, 2016, 8:16 a.m. | #1
On Thu, 2016-10-20 at 10:12 +0200, Jerome Forissier wrote:
> When $conststructsfile does not exist or is empty, we may get false

> warnings such as:

> WARNING: struct  should normally be const

> 

> Fix that by not running the string match if $const_structs is empty.


Why should $const_structs ever be empty?

> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

> ---

>  scripts/checkpatch.pl | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl

> index a8368d1..722a319 100755

> --- a/scripts/checkpatch.pl

> +++ b/scripts/checkpatch.pl

> @@ -6010,7 +6010,8 @@ sub process {

>  		}

>  

>  # check for various structs that are normally const (ops, kgdb, device_tree)

> -		if ($line !~ /\bconst\b/ &&

> +		if ($const_structs ne "" &&

> +		    $line !~ /\bconst\b/ &&

>  		    $line =~ /\bstruct\s+($const_structs)\b/) {

>  			WARN("CONST_STRUCT",

>  			     "struct $1 should normally be const\n" .

>
Jerome Forissier Oct. 20, 2016, 8:18 a.m. | #2
On 10/20/2016 10:16 AM, Joe Perches wrote:
> On Thu, 2016-10-20 at 10:12 +0200, Jerome Forissier wrote:

>> When $conststructsfile does not exist or is empty, we may get false

>> warnings such as:

>> WARNING: struct  should normally be const

>>

>> Fix that by not running the string match if $const_structs is empty.

> 

> Why should $const_structs ever be empty?


When running out-of-tree, i.e., using checkpatch.pl on non-kernel sources.

> 

>> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

>> ---

>>  scripts/checkpatch.pl | 3 ++-

>>  1 file changed, 2 insertions(+), 1 deletion(-)

>>

>> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl

>> index a8368d1..722a319 100755

>> --- a/scripts/checkpatch.pl

>> +++ b/scripts/checkpatch.pl

>> @@ -6010,7 +6010,8 @@ sub process {

>>  		}

>>  

>>  # check for various structs that are normally const (ops, kgdb, device_tree)

>> -		if ($line !~ /\bconst\b/ &&

>> +		if ($const_structs ne "" &&

>> +		    $line !~ /\bconst\b/ &&

>>  		    $line =~ /\bstruct\s+($const_structs)\b/) {

>>  			WARN("CONST_STRUCT",

>>  			     "struct $1 should normally be const\n" .

>>
Joe Perches Oct. 20, 2016, 8:25 a.m. | #3
On Thu, 2016-10-20 at 10:18 +0200, Jerome Forissier wrote:
> On 10/20/2016 10:16 AM, Joe Perches wrote

> . Why should $const_structs ever be empty?

> When running out-of-tree, i.e., using checkpatch.pl on non-kernel sources.


Oh, alright.

Patch hide | download patch | download mbox

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a8368d1..722a319 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -6010,7 +6010,8 @@  sub process {
 		}
 
 # check for various structs that are normally const (ops, kgdb, device_tree)
-		if ($line !~ /\bconst\b/ &&
+		if ($const_structs ne "" &&
+		    $line !~ /\bconst\b/ &&
 		    $line =~ /\bstruct\s+($const_structs)\b/) {
 			WARN("CONST_STRUCT",
 			     "struct $1 should normally be const\n" .