Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stephen Hemminger and committed by
Michal Marek
86d08e56 a208868f

+33 -32
+33 -32
scripts/namespace.pl
··· 175 175 } 176 176 if (! -e "$source.c" && ! -e "$source.S") { 177 177 # 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 + 182 181 my $comment; 183 - while (<OBJDUMPDATA>) { 182 + while (<$objdumpdata>) { 184 183 chomp(); 185 184 if (/^In archive/) { 186 185 # Archives are always conglomerate ··· 189 190 next if (! /^[ 0-9a-f]{5,} /); 190 191 $comment .= substr($_, 43); 191 192 } 192 - close(OBJDUMPDATA); 193 + close($objdumpdata); 194 + 193 195 if (!defined($comment) || $comment !~ /GCC\:.*GCC\:/m) { 194 196 printf STDERR "No source file found for $fullname\n"; 195 197 } 196 198 return; 197 199 } 198 - if (! open(NMDATA, "$nm $basename|")) { 199 - printf STDERR "$nm $fullname failed $!\n"; 200 - return; 201 - } 200 + open (my $nmdata, "$nm $basename|") 201 + or die "$nm $fullname failed $!\n"; 202 + 202 203 my @nmdata; 203 - while (<NMDATA>) { 204 + while (<$nmdata>) { 204 205 chop; 205 206 ($type, $name) = (split(/ +/, $_, 3))[1..2]; 206 207 # Expected types ··· 267 268 } 268 269 } 269 270 } 270 - close(NMDATA); 271 + close($nmdata); 272 + 271 273 if ($#nmdata < 0) { 272 274 if ( 273 275 $fullname ne "lib/brlock.o" ··· 316 316 317 317 sub list_multiply_defined 318 318 { 319 - my ($name, $module); 320 - foreach $name (keys(%def)) { 319 + foreach my $name (keys(%def)) { 321 320 if ($#{$def{$name}} > 0) { 322 321 # Special case for cond_syscall 323 322 if ($#{$def{$name}} == 1 && $name =~ /^sys_/ && ··· 332 333 &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name); 333 334 next; 334 335 } 336 + 335 337 printf "$name is multiply defined in :-\n"; 336 - foreach $module (@{$def{$name}}) { 338 + foreach my $module (@{$def{$name}}) { 337 339 printf "\t$module\n"; 338 340 } 339 341 } ··· 343 343 344 344 sub resolve_external_references 345 345 { 346 - my ($object, $type, $name, $i, $j, $kstrtab, $ksymtab, $export); 346 + my ($kstrtab, $ksymtab, $export); 347 + 347 348 printf "\n"; 348 - foreach $object (keys(%nmdata)) { 349 + foreach my $object (keys(%nmdata)) { 349 350 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); 352 353 if ($type eq "U" || $type eq "w") { 353 354 if (exists($def{$name}) || exists($ksymtab{$name})) { 354 355 # add the owning object to the nmdata ··· 358 357 $kstrtab = "R __kstrtab_$name"; 359 358 $ksymtab = "R __ksymtab_$name"; 360 359 $export = 0; 361 - for ($j = 0; $j <= $#{$nmdata}; ++$j) { 360 + for (my $j = 0; $j <= $#{$nmdata}; ++$j) { 362 361 if ($nmdata->[$j] eq $kstrtab || 363 362 $nmdata->[$j] eq $ksymtab) { 364 363 $export = 1; ··· 425 424 sub list_extra_externals 426 425 { 427 426 my %noref = (); 428 - my ($name, @module, $module, $export); 429 - foreach $name (keys(%def)) { 427 + 428 + foreach my $name (keys(%def)) { 430 429 if (! exists($ref{$name})) { 431 - @module = @{$def{$name}}; 432 - foreach $module (@module) { 430 + my @module = @{$def{$name}}; 431 + foreach my $module (@module) { 433 432 if (! exists($noref{$module})) { 434 433 $noref{$module} = []; 435 434 } ··· 439 438 } 440 439 if (%noref) { 441 440 printf "\nExternally defined symbols with no external references\n"; 442 - foreach $module (sort(keys(%noref))) { 441 + foreach my $module (sort(keys(%noref))) { 443 442 printf " $module\n"; 444 443 foreach (sort(@{$noref{$module}})) { 445 - if (exists($export{$_})) { 446 - $export = " (export only)"; 447 - } 448 - else { 449 - $export = ""; 450 - } 451 - printf " $_$export\n"; 444 + my $export; 445 + if (exists($export{$_})) { 446 + $export = " (export only)"; 447 + } else { 448 + $export = ""; 449 + } 450 + printf " $_$export\n"; 452 451 } 453 452 } 454 453 }