|
@@ -4836,10 +4836,34 @@ sub process {
|
|
|
|
|
|
# check for needless "if (<foo>) fn(<foo>)" uses
|
|
# check for needless "if (<foo>) fn(<foo>)" uses
|
|
if ($prevline =~ /\bif\s*\(\s*($Lval)\s*\)/) {
|
|
if ($prevline =~ /\bif\s*\(\s*($Lval)\s*\)/) {
|
|
- my $expr = '\s*\(\s*' . quotemeta($1) . '\s*\)\s*;';
|
|
|
|
- if ($line =~ /\b(kfree|usb_free_urb|debugfs_remove(?:_recursive)?)$expr/) {
|
|
|
|
- WARN('NEEDLESS_IF',
|
|
|
|
- "$1(NULL) is safe and this check is probably not required\n" . $hereprev);
|
|
|
|
|
|
+ my $tested = quotemeta($1);
|
|
|
|
+ my $expr = '\s*\(\s*' . $tested . '\s*\)\s*;';
|
|
|
|
+ if ($line =~ /\b(kfree|usb_free_urb|debugfs_remove(?:_recursive)?|(?:kmem_cache|mempool|dma_pool)_destroy)$expr/) {
|
|
|
|
+ my $func = $1;
|
|
|
|
+ if (WARN('NEEDLESS_IF',
|
|
|
|
+ "$func(NULL) is safe and this check is probably not required\n" . $hereprev) &&
|
|
|
|
+ $fix) {
|
|
|
|
+ my $do_fix = 1;
|
|
|
|
+ my $leading_tabs = "";
|
|
|
|
+ my $new_leading_tabs = "";
|
|
|
|
+ if ($lines[$linenr - 2] =~ /^\+(\t*)if\s*\(\s*$tested\s*\)\s*$/) {
|
|
|
|
+ $leading_tabs = $1;
|
|
|
|
+ } else {
|
|
|
|
+ $do_fix = 0;
|
|
|
|
+ }
|
|
|
|
+ if ($lines[$linenr - 1] =~ /^\+(\t+)$func\s*\(\s*$tested\s*\)\s*;\s*$/) {
|
|
|
|
+ $new_leading_tabs = $1;
|
|
|
|
+ if (length($leading_tabs) + 1 ne length($new_leading_tabs)) {
|
|
|
|
+ $do_fix = 0;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ $do_fix = 0;
|
|
|
|
+ }
|
|
|
|
+ if ($do_fix) {
|
|
|
|
+ fix_delete_line($fixlinenr - 1, $prevrawline);
|
|
|
|
+ $fixed[$fixlinenr] =~ s/^\+$new_leading_tabs/\+$leading_tabs/;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|