More nvi cleanups.

diff --git a/bugcounts b/bugcounts
index 46cdf368535e6e54a08dd6f6268bd8befcf65990..b0337fc01d7f68a7c88f605e54cafc3de4f3d7f6 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -64,12 +64,7 @@ for my $p (keys %scanlib::packagelist) {
                        my $sect = ($scanlib::comments{$nr} =~ m/\[([^]]*)\]/);
                        $sectcount{$sect}++;
                }
                        my $sect = ($scanlib::comments{$nr} =~ m/\[([^]]*)\]/);
                        $sectcount{$sect}++;
                }

-               unless ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/ or
-                       $scanlib::bugs{$nr} =~ m/ \[[^]]*X/ or
-                       ($scanlib::bugs{$nr} =~ m/ \[[^]]*[OSUE]/ and $scanlib::bugs{$nr} !~ m/ \[[^]]*T/)) {
-                       $worrycount++;
-                       # print STDERR "$nr $bugs{$nr}\n";
-               }       
+               $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));

        }
 
        if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
        }
 
        if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/) {