From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 18 Oct 2021 08:46:04 +0000 (+0200)
Subject: checksrc: improve the SPACESEMICOLON error message
X-Git-Tag: curl-7_80_0~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3da8b4dabf712f6fd709334955fce3694df94e9e;p=thirdparty%2Fcurl.git

checksrc: improve the SPACESEMICOLON error message

and adjust the MULTISPACE one to use plural

Closes #7866
---

diff --git a/lib/checksrc.pl b/lib/checksrc.pl
index bb3495f792..8f98a99ab5 100755
--- a/lib/checksrc.pl
+++ b/lib/checksrc.pl
@@ -547,7 +547,6 @@ sub scanfile {
             }
             elsif($even && $postparen &&
                ($postparen !~ /^ *$/) && ($postparen !~ /^ *[,{&|\\]+/)) {
-                print STDERR "5: '$postparen'\n";
                 checkwarn("ONELINECONDITION",
                           $line, length($l)-length($postparen), $file, $l,
                           "conditional block on the same line");
@@ -648,7 +647,7 @@ sub scanfile {
         # check for space before the semicolon last in a line
         if($l =~ /^(.*[^ ].*) ;$/) {
             checkwarn("SPACESEMICOLON",
-                      $line, length($1), $file, $ol, "space before last semicolon");
+                      $line, length($1), $file, $ol, "no space before semicolon");
         }
 
         # scan for use of banned functions
@@ -706,7 +705,6 @@ sub scanfile {
         # more steps, if not a cpp line
         if(!$prevp && ($prevl =~ /^( *)((if|while|for)\(.*\{|else)\z/)) {
             my $first = length($1);
-
             # this line has some character besides spaces
             if($l =~ /^( *)[^ ]/) {
                 my $second = length($1);
@@ -799,9 +797,7 @@ sub scanfile {
            $nostr =~ /^(.*(\S)) + [{?]/i) {
             checkwarn("MULTISPACE",
                       $line, length($1)+1, $file, $ol,
-                      "multiple space");
-            print STDERR "L: $l\n";
-            print STDERR "nostr: $nostr\n";
+                      "multiple spaces");
         }
       preproc:
         $line++;