kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed another "closedir() on undefined".

Browse source 
Made the code around PLIST.* variables prettier.
This commit is contained in:
rillig 2008-10-18 16:35:59 +00:00
parent d585947edd
commit 10b7bee739
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgtools/pkglint/files/pkglint.pl
View file

@ -1,5 +1,5 @@
#! @PERL@ #! @PERL@
# $NetBSD: pkglint.pl,v 1.775 2008/10/16 09:08:21 rillig Exp $ # $NetBSD: pkglint.pl,v 1.776 2008/10/18 16:35:59 rillig Exp $
# #
# pkglint - static analyzer and checker for pkgsrc packages # pkglint - static analyzer and checker for pkgsrc packages
@ -2822,12 +2822,13 @@ sub get_subdirs($) {
my (@result) = (); my (@result) = ();
if (opendir(DIR, $dir)) { if (opendir(DIR, $dir)) {
foreach my $subdir (readdir(DIR)) { my @subdirs = readdir(DIR);
closedir(DIR) or die;
foreach my $subdir (@subdirs) {
if ($subdir ne "." && $subdir ne ".." && $subdir ne "CVS" && -d "${dir}/${subdir}" && !is_emptydir("${dir}/${subdir}")) { if ($subdir ne "." && $subdir ne ".." && $subdir ne "CVS" && -d "${dir}/${subdir}" && !is_emptydir("${dir}/${subdir}")) {
push(@result, $subdir); push(@result, $subdir);
} }
} }
closedir(DIR);
} }
return @result; return @result;
} }
@ -4059,19 +4060,12 @@ sub checkline_mk_varuse($$$$) {
if (defined($type) && !($type->is_guessed)) { if (defined($type) && !($type->is_guessed)) {
# Great. # Great.
} elsif (defined($pkgctx_vardef) && exists($pkgctx_vardef->{$varname})) { } elsif (var_is_used($varname)) {
# A variable that is defined somewhere may also be used. # Fine.
} elsif (exists($mkctx_vardef->{$varname})) {
# A variable that has been defined in the current file
# may also be used.
} elsif (defined($mkctx_for_variables) && exists($mkctx_for_variables->{$varname})) { } elsif (defined($mkctx_for_variables) && exists($mkctx_for_variables->{$varname})) {
# Variables defined in .for loops are also ok. # Variables defined in .for loops are also ok.
} elsif (defined($mkctx_plist_vars) && exists($mkctx_plist_vars->{$varname})) {
# PLIST variables are also ok.
} else { } else {
$opt_warn_extra and $line->log_warning("${varname} is used but not defined. Spelling mistake?"); $opt_warn_extra and $line->log_warning("${varname} is used but not defined. Spelling mistake?");
} }