diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2010-02-22 18:17:26 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-03-07 15:43:49 -0500 |
commit | bae4cecc09db9d472d71cb262de3c976147ad628 (patch) | |
tree | 5376d38413f3b6b51e45decb54ab1ea4e034f8e9 | |
parent | dbbe33e99f41a6f07e61dbce455964112d8ac72b (diff) |
headers_install: use local file handles
Better practice to use 3 arg open and local file handles.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: WANG Cong <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>
-rw-r--r-- | scripts/headers_install.pl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl index b89ca2c58fdb..4ca3be3b2e50 100644 --- a/scripts/headers_install.pl +++ b/scripts/headers_install.pl | |||
@@ -23,13 +23,13 @@ my ($readdir, $installdir, $arch, @files) = @ARGV; | |||
23 | my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__"; | 23 | my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__"; |
24 | 24 | ||
25 | foreach my $file (@files) { | 25 | foreach my $file (@files) { |
26 | local *INFILE; | ||
27 | local *OUTFILE; | ||
28 | my $tmpfile = "$installdir/$file.tmp"; | 26 | my $tmpfile = "$installdir/$file.tmp"; |
29 | open(INFILE, "<$readdir/$file") | 27 | |
30 | or die "$readdir/$file: $!\n"; | 28 | open(my $in, '<', "$readdir/$file") |
31 | open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n"; | 29 | or die "$readdir/$file: $!\n"; |
32 | while (my $line = <INFILE>) { | 30 | open(my $out, '>', $tmpfile) |
31 | or die "$tmpfile: $!\n"; | ||
32 | while (my $line = <$in>) { | ||
33 | $line =~ s/([\s(])__user\s/$1/g; | 33 | $line =~ s/([\s(])__user\s/$1/g; |
34 | $line =~ s/([\s(])__force\s/$1/g; | 34 | $line =~ s/([\s(])__force\s/$1/g; |
35 | $line =~ s/([\s(])__iomem\s/$1/g; | 35 | $line =~ s/([\s(])__iomem\s/$1/g; |
@@ -39,10 +39,11 @@ foreach my $file (@files) { | |||
39 | $line =~ s/(^|\s)(inline)\b/$1__$2__/g; | 39 | $line =~ s/(^|\s)(inline)\b/$1__$2__/g; |
40 | $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; | 40 | $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; |
41 | $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g; | 41 | $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g; |
42 | printf OUTFILE "%s", $line; | 42 | printf {$out} "%s", $line; |
43 | } | 43 | } |
44 | close OUTFILE; | 44 | close $out; |
45 | close INFILE; | 45 | close $in; |
46 | |||
46 | system $unifdef . " $tmpfile > $installdir/$file"; | 47 | system $unifdef . " $tmpfile > $installdir/$file"; |
47 | unlink $tmpfile; | 48 | unlink $tmpfile; |
48 | } | 49 | } |