Eric Lee / smarc-ti-linux-kernel | Embedian Git Server

Commit 3da27157316cbcce326d56faa0a7a5cadc7ae507

Authored by Stephen Hemminger 2010-02-23 07:17:12 +0800

Committed by Michal Marek 2010-03-08 04:19:57 +0800

checkincludes: fix perlcritic warnings

Turn on strict checking.
Use local file handles.
Use three argument open.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Cc: Cong Wang <amwang@redhat.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 1 changed file with 14 additions and 10 deletions Inline Diff

scripts/checkincludes.pl

scripts/checkincludes.pl

Diff comments View file @ 3da2715

 #!/usr/bin/perl
 #
 # checkincludes: find/remove files included more than once
 #
 # Copyright abandoned, 2000, Niels Kristian Bech Jensen <nkbj@image.dk>.
 # Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com>
 #
 # This script checks for duplicate includes. It also has support
 # to remove them in place. Note that this will not take into
 # consideration macros so you should run this only if you know
 # 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";
 	print "To remove duplicated includes in place use -r\n";
 	exit 1;
 }
 my $remove = 0;
 if ($#ARGV < 0) {
 	usage();
 }
 if ($#ARGV >= 1) {
 	if ($ARGV[0] =~ /^-/) {
 		if ($ARGV[0] eq "-r") {
 			$remove = 1;
 			shift;
 		} else {
 			usage();
 		}
 	}
 }
-foreach $file (@ARGV) {
+foreach my $file (@ARGV) {
-	open(FILE, $file) or die "Cannot open $file: $!.\n";
+	open(my $f, '<', $file)
+	    or die "Cannot open $file: $!.\n";
 	my %includedfiles = ();
 	my @file_lines = ();
-	while (<FILE>) {
+	while (<$f>) {
 		if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
 			++$includedfiles{$1};
 		}
 		push(@file_lines, $_);
 	}
-	close(FILE);
+	close($f);
 	if (!$remove) {
-		foreach $filename (keys %includedfiles) {
+		foreach my $filename (keys %includedfiles) {
 			if ($includedfiles{$filename} > 1) {
 				print "$file: $filename is included more than once.\n";
 			}
 		}
 		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) {
-			foreach $filename (keys %includedfiles) {
+			foreach my $filename (keys %includedfiles) {
 				if ($1 eq $filename) {
 					if ($includedfiles{$filename} > 1) {
 						$includedfiles{$filename}--;
 						$dups++;
 					} else {
-						print FILE $_;
+						print {$f} $_;
 					}
 				}
 			}
 		} else {
-			print FILE $_;
+			print {$f} $_;
 		}
 	}
 	if ($dups > 0) {
 		print "$file: removed $dups duplicate includes\n";
 	}
-	close(FILE);
+	close($f);
 }