Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...

1 files changed, 14 insertions, 10 deletions

diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 676ddc07d6fa..97b2c6143fe4 100755
--- 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.
 
+use strict;
+
 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 = ();
 
-        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";
                         }
@@ -59,27 +62,28 @@ foreach $file (@ARGV) {
                 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);
 }