git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/drm_crtc: return -EFAULT on copy_to_user errors
[safe/jmp/linux-2.6]
/
scripts
/
checkincludes.pl
diff --git
a/scripts/checkincludes.pl
b/scripts/checkincludes.pl
index
676ddc0
..
97b2c61
100755
(executable)
--- a/
scripts/checkincludes.pl
+++ b/
scripts/checkincludes.pl
@@
-11,6
+11,8
@@
# you do have real dups and do not have them under #ifdef's. You
# could also just review the results.
# you do have real dups and do not have them under #ifdef's. You
# could also just review the results.
+use strict;
+
sub usage {
print "Usage: checkincludes.pl [-r]\n";
print "By default we just warn of duplicates\n";
sub usage {
print "Usage: checkincludes.pl [-r]\n";
print "By default we just warn of duplicates\n";
@@
-35,23
+37,24
@@
if ($#ARGV >= 1) {
}
}
}
}
-foreach $file (@ARGV) {
- open(FILE, $file) or die "Cannot open $file: $!.\n";
+foreach my $file (@ARGV) {
+ open(my $f, '<', $file)
+ or die "Cannot open $file: $!.\n";
my %includedfiles = ();
my @file_lines = ();
my %includedfiles = ();
my @file_lines = ();
- while (<
FILE
>) {
+ while (<
$f
>) {
if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
++$includedfiles{$1};
}
push(@file_lines, $_);
}
if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
++$includedfiles{$1};
}
push(@file_lines, $_);
}
- close(
FILE
);
+ close(
$f
);
if (!$remove) {
if (!$remove) {
- foreach $filename (keys %includedfiles) {
+ foreach
my
$filename (keys %includedfiles) {
if ($includedfiles{$filename} > 1) {
print "$file: $filename is included more than once.\n";
}
if ($includedfiles{$filename} > 1) {
print "$file: $filename is included more than once.\n";
}
@@
-59,27
+62,28
@@
foreach $file (@ARGV) {
next;
}
next;
}
- open(FILE,">$file") || die("Cannot write to $file: $!");
+ open($f, '>', $file)
+ or die("Cannot write to $file: $!");
my $dups = 0;
foreach (@file_lines) {
if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
my $dups = 0;
foreach (@file_lines) {
if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
- foreach $filename (keys %includedfiles) {
+ foreach
my
$filename (keys %includedfiles) {
if ($1 eq $filename) {
if ($includedfiles{$filename} > 1) {
$includedfiles{$filename}--;
$dups++;
} else {
if ($1 eq $filename) {
if ($includedfiles{$filename} > 1) {
$includedfiles{$filename}--;
$dups++;
} else {
- print
FILE
$_;
+ print
{$f}
$_;
}
}
}
} else {
}
}
}
} else {
- print
FILE
$_;
+ print
{$f}
$_;
}
}
if ($dups > 0) {
print "$file: removed $dups duplicate includes\n";
}
}
}
if ($dups > 0) {
print "$file: removed $dups duplicate includes\n";
}
- close(
FILE
);
+ close(
$f
);
}
}