Skip to content

Commit 86d08e5

Browse files
Stephen Hemmingermichal42
Stephen Hemminger
authored and
michal42
committed
namespace: perlcritic warnings
Use local file handle not global. Make loop and other variables local in scope. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Cc: Hui Zhu <teawater@gmail.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>
1 parent a208868 commit 86d08e5

1 file changed

Lines changed: 33 additions & 32 deletions

File tree

‎scripts/namespace.pl‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,11 @@ sub do_nm
175175
}
176176
if (! -e "$source.c" && ! -e "$source.S") {
177177
# No obvious source, exclude the object if it is conglomerate
178-
if (! open(OBJDUMPDATA, "$objdump $basename|")) {
179-
printf STDERR "$objdump $fullname failed $!\n";
180-
return;
181-
}
178+
open(my $objdumpdata, "$objdump $basename|")
179+
or die "$objdump $fullname failed $!\n";
180+
182181
my $comment;
183-
while (<OBJDUMPDATA>) {
182+
while (<$objdumpdata>) {
184183
chomp();
185184
if (/^In archive/) {
186185
# Archives are always conglomerate
@@ -190,18 +189,18 @@ sub do_nm
190189
next if (! /^[ 0-9a-f]{5,} /);
191190
$comment .= substr($_, 43);
192191
}
193-
close(OBJDUMPDATA);
192+
close($objdumpdata);
193+
194194
if (!defined($comment) || $comment !~ /GCC\:.*GCC\:/m) {
195195
printf STDERR "No source file found for $fullname\n";
196196
}
197197
return;
198198
}
199-
if (! open(NMDATA, "$nm $basename|")) {
200-
printf STDERR "$nm $fullname failed $!\n";
201-
return;
202-
}
199+
open (my $nmdata, "$nm $basename|")
200+
or die "$nm $fullname failed $!\n";
201+
203202
my @nmdata;
204-
while (<NMDATA>) {
203+
while (<$nmdata>) {
205204
chop;
206205
($type, $name) = (split(/ +/, $_, 3))[1..2];
207206
# Expected types
@@ -268,7 +267,8 @@ sub do_nm
268267
}
269268
}
270269
}
271-
close(NMDATA);
270+
close($nmdata);
271+
272272
if ($#nmdata < 0) {
273273
if (
274274
$fullname ne "lib/brlock.o"
@@ -316,8 +316,7 @@ sub drop_def
316316

317317
sub list_multiply_defined
318318
{
319-
my ($name, $module);
320-
foreach $name (keys(%def)) {
319+
foreach my $name (keys(%def)) {
321320
if ($#{$def{$name}} > 0) {
322321
# Special case for cond_syscall
323322
if ($#{$def{$name}} == 1 && $name =~ /^sys_/ &&
@@ -333,8 +332,9 @@ sub list_multiply_defined
333332
&drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name);
334333
next;
335334
}
335+
336336
printf "$name is multiply defined in :-\n";
337-
foreach $module (@{$def{$name}}) {
337+
foreach my $module (@{$def{$name}}) {
338338
printf "\t$module\n";
339339
}
340340
}
@@ -343,12 +343,13 @@ sub list_multiply_defined
343343

344344
sub resolve_external_references
345345
{
346-
my ($object, $type, $name, $i, $j, $kstrtab, $ksymtab, $export);
346+
my ($kstrtab, $ksymtab, $export);
347+
347348
printf "\n";
348-
foreach $object (keys(%nmdata)) {
349+
foreach my $object (keys(%nmdata)) {
349350
my $nmdata = $nmdata{$object};
350-
for ($i = 0; $i <= $#{$nmdata}; ++$i) {
351-
($type, $name) = split(' ', $nmdata->[$i], 2);
351+
for (my $i = 0; $i <= $#{$nmdata}; ++$i) {
352+
my ($type, $name) = split(' ', $nmdata->[$i], 2);
352353
if ($type eq "U" || $type eq "w") {
353354
if (exists($def{$name}) || exists($ksymtab{$name})) {
354355
# add the owning object to the nmdata
@@ -357,7 +358,7 @@ sub resolve_external_references
357358
$kstrtab = "R __kstrtab_$name";
358359
$ksymtab = "R __ksymtab_$name";
359360
$export = 0;
360-
for ($j = 0; $j <= $#{$nmdata}; ++$j) {
361+
for (my $j = 0; $j <= $#{$nmdata}; ++$j) {
361362
if ($nmdata->[$j] eq $kstrtab ||
362363
$nmdata->[$j] eq $ksymtab) {
363364
$export = 1;
@@ -424,11 +425,11 @@ sub resolve_external_references
424425
sub list_extra_externals
425426
{
426427
my %noref = ();
427-
my ($name, @module, $module, $export);
428-
foreach $name (keys(%def)) {
428+
429+
foreach my $name (keys(%def)) {
429430
if (! exists($ref{$name})) {
430-
@module = @{$def{$name}};
431-
foreach $module (@module) {
431+
my @module = @{$def{$name}};
432+
foreach my $module (@module) {
432433
if (! exists($noref{$module})) {
433434
$noref{$module} = [];
434435
}
@@ -438,16 +439,16 @@ sub list_extra_externals
438439
}
439440
if (%noref) {
440441
printf "\nExternally defined symbols with no external references\n";
441-
foreach $module (sort(keys(%noref))) {
442+
foreach my $module (sort(keys(%noref))) {
442443
printf " $module\n";
443444
foreach (sort(@{$noref{$module}})) {
444-
if (exists($export{$_})) {
445-
$export = " (export only)";
446-
}
447-
else {
448-
$export = "";
449-
}
450-
printf " $_$export\n";
445+
my $export;
446+
if (exists($export{$_})) {
447+
$export = " (export only)";
448+
} else {
449+
$export = "";
450+
}
451+
printf " $_$export\n";
451452
}
452453
}
453454
}

0 commit comments

Comments
 (0)