checksrc: fix code quality findings

- fix counting errors. Update test1185 results accordingly.
- fix an error message.
- tidy up regexp syntax.

Pointed out by GitHub Code Quality

Closes #21429
This commit is contained in:
Viktor Szakats 2026-04-24 01:24:32 +02:00
parent 4bc34a5416
commit ee65f19e2a
No known key found for this signature in database
2 changed files with 12 additions and 12 deletions

View file

@ -273,8 +273,8 @@ sub readlocalfile {
sub checkwarn {
my ($name, $num, $col, $file, $line, $msg, $error) = @_;
my $w=$error ? "error" : "warning";
my $nowarn=0;
my $w = $error ? "error" : "warning";
my $nowarn = 0;
#if(!$warnings{$name}) {
# print STDERR "Dev! there is no description for $name!\n";
@ -297,20 +297,20 @@ sub checkwarn {
if($nowarn) {
$suppressed++;
if($w) {
$swarnings++;
if($error) {
$serrors++;
}
else {
$serrors++;
$swarnings++;
}
return;
}
if($w) {
$warnings++;
if($error) {
$errors++;
}
else {
$errors++;
$warnings++;
}
$col++;
@ -414,7 +414,7 @@ readlocalfile($file);
do {
if($wlist !~ / $file /) {
my $fullname = $file;
$fullname = "$dir/$file" if($fullname !~ '^\.?\.?/');
$fullname = "$dir/$file" if($fullname !~ /^\.?\.?\//);
scanfile($fullname);
}
$file = shift @ARGV;
@ -443,7 +443,7 @@ sub checksrc_endoffile {
for(keys %ignore_set) {
if($ignore_set{$_} && !$ignore_used{$_}) {
checkwarn("UNUSEDIGNORE", $ignore_set{$_},
length($_)+11, $file,
length($_) + 11, $file,
$ignore_line[$ignore_set{$_}],
"Unused ignore: $_");
}
@ -610,7 +610,7 @@ sub scanfile {
if($l =~ /^(.*)\w\*\//) {
checkwarn("COMMENTNOSPACEEND",
$line, length($1) + 1, $file, $l,
"Missing space end comment end");
"Missing space before comment end");
}
if($l =~ /(.*)(FIXME|TODO)/) {

View file

@ -233,7 +233,7 @@ void startfunc(int a, int b) {
./%LOGDIR/code1185.c:1:1: error: Missing closing comment (OPENCOMMENT)
%SP
^
checksrc: 0 errors and 45 warnings
checksrc: 3 errors and 42 warnings
</stdout>
<errorcode>
5