Commit 69402a69 authored by Don Slutz's avatar Don Slutz Committed by Blue Swirl
Browse files

CHECKPATCH: Add --debug adv_apw 



Add debug options to find this issue.  They were not listed
in the help because the are not simple to understand the output of.

Signed-off-by: default avatarDon Slutz <Don@CloudSwitch.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 5424302e

scripts/checkpatch.pl

+32 −19
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ my $dbg_type = 0; 
my $dbg_attr = 0;

my $dbg_adv_dcs = 0;

my $dbg_adv_checking = 0;

my $dbg_adv_apw = 0;

for my $key (keys %debug) {

	## no critic

	eval "\${dbg_$key} = '$debug{$key}';";
@@ -2488,8 +2489,11 @@ sub process { 
		if ($line =~ /(^.*)\bif\b/ && $line !~ /\#\s*if/) {

			my ($level, $endln, @chunks) =

				ctx_statement_full($linenr, $realcnt, 1);

			#print "chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";

			#print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n";

                        if ($dbg_adv_apw) {

                            print "APW: chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";

                            print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n"

                                if $#chunks >= 1;

                        }

			if ($#chunks >= 0 && $level == 0) {

				my $allowed = 0;

				my $seen = 0;
@@ -2514,17 +2518,21 @@ sub process { 


					$seen++ if ($block =~ /^\s*{/);



					#print "cond<$cond> block<$block> allowed<$allowed>\n";

                                        print "APW: cond<$cond> block<$block> allowed<$allowed>\n"

                                            if $dbg_adv_apw;

					if (statement_lines($cond) > 1) {

						#print "APW: ALLOWED: cond<$cond>\n";

                                            print "APW: ALLOWED: cond<$cond>\n"

                                                if $dbg_adv_apw;

                                            $allowed = 1;

					}

					if ($block =~/\b(?:if|for|while)\b/) {

						#print "APW: ALLOWED: block<$block>\n";

                                            print "APW: ALLOWED: block<$block>\n"

                                                if $dbg_adv_apw;

                                            $allowed = 1;

					}

					if (statement_block_size($block) > 1) {

						#print "APW: ALLOWED: lines block<$block>\n";

                                            print "APW: ALLOWED: lines block<$block>\n"

                                                if $dbg_adv_apw;

                                            $allowed = 1;

					}

				}
@@ -2541,7 +2549,8 @@ sub process { 


			# Check the pre-context.

			if (substr($line, 0, $-[0]) =~ /(\}\s*)$/) {

				#print "APW: ALLOWED: pre<$1>\n";

                            print "APW: ALLOWED: pre<$pre> line<$line>\n"

                                if $dbg_adv_apw;

                            $allowed = 1;

			}
@@ -2556,15 +2565,18 @@ sub process { 
				substr($block, 0, length($cond), '');

			}

			if (statement_lines($cond) > 1) {

				#print "APW: ALLOWED: cond<$cond>\n";

                            print "APW: ALLOWED: cond<$cond>\n"

                                if $dbg_adv_apw;

                            $allowed = 1;

			}

			if ($block =~/\b(?:if|for|while)\b/) {

				#print "APW: ALLOWED: block<$block>\n";

                            print "APW: ALLOWED: block<$block>\n"

                                if $dbg_adv_apw;

                            $allowed = 1;

			}

			if (statement_block_size($block) > 1) {

				#print "APW: ALLOWED: lines block<$block>\n";

                            print "APW: ALLOWED: lines block<$block>\n"

                                if $dbg_adv_apw;

                            $allowed = 1;

			}

			# Check the post-context.
@@ -2574,7 +2586,8 @@ sub process { 
					substr($block, 0, length($cond), '');

				}

				if ($block =~ /^\s*\{/) {

					#print "APW: ALLOWED: chunk-1 block<$block>\n";

                                    print "APW: ALLOWED: chunk-1 block<$block>\n"

                                        if $dbg_adv_apw;

                                    $allowed = 1;

				}

			}