From 427ddda525082d1a4e23a5786c7c902cd262119f Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Fri, 29 Dec 2017 13:48:25 -0800 Subject: [PATCH] remove defined %hash and defined @array tests --- scripts/symname.pl | 4 ++-- scripts/vartree.pl | 6 +++--- src/CommandStubs.pl | 2 +- src/Modules/DumpVars.pl | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/symname.pl b/scripts/symname.pl index f0562ab..88a4754 100755 --- a/scripts/symname.pl +++ b/scripts/symname.pl @@ -96,10 +96,10 @@ sub DumpPackage { $scalar++; $size += length($sym); } - elsif ( defined @sym ) { + elsif ( @sym ) { $size += &DumpArray( $pad + 1, $symname, \@sym ); } - elsif ( defined %sym ) { + elsif ( %sym ) { $size += &DumpHash( $pad + 1, $symname, \%sym ); } elsif ( ( $symname =~ /::/ ) and ( $symname ne 'main::' ) ) { diff --git a/scripts/vartree.pl b/scripts/vartree.pl index f22bbac..8517e3e 100755 --- a/scripts/vartree.pl +++ b/scripts/vartree.pl @@ -53,7 +53,7 @@ sub vartree { # array. foreach $symname ( sort keys %$package ) { local *sym = $$package{$symname}; - next unless ( defined @sym ); + next unless ( @sym ); print "\@$symname\n"; &tree( 2, "ARRAY", $symname ); } @@ -61,14 +61,14 @@ sub vartree { # hash. foreach $symname ( sort keys %$package ) { local *sym = $$package{$symname}; - next unless ( defined %sym ); + next unless ( %sym ); print "\%$symname\n"; &tree( 2, "HASH", $symname ); } foreach $symname ( sort keys %$package ) { local *sym = $$package{$symname}; - next unless ( defined %sym ); + next unless ( %sym ); next unless ( $symname =~ /::/ ); next if ( $symname eq 'main::' ); diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl index e66e6d8..bcb794a 100644 --- a/src/CommandStubs.pl +++ b/src/CommandStubs.pl @@ -49,7 +49,7 @@ sub parseCmdHook { &shmFlush(); - if ( !defined %cmdhooks ) { + if ( !%cmdhooks ) { &WARN('%cmdhooks does not exist.'); return 0; } diff --git a/src/Modules/DumpVars.pl b/src/Modules/DumpVars.pl index 3ca982d..71c1787 100644 --- a/src/Modules/DumpVars.pl +++ b/src/Modules/DumpVars.pl @@ -33,7 +33,7 @@ sub DumpNames(\%$) { foreach $symname ( sort keys %$package ) { local *sym = $$package{$symname}; - next unless ( defined %sym ); + next unless ( %sym ); next unless ( $symname =~ /::/ ); &dumpvarslog(" $symname"); $countlines++; @@ -67,7 +67,7 @@ sub DumpNames(\%$) { # Lists. foreach $symname ( sort keys %$package ) { local *sym = $$package{$symname}; - next unless ( defined @sym ); + next unless ( @sym ); &dumpvarslog( "List '$packname' \@$symname (" . scalar( @{$symname} ) . ")" ); @@ -87,7 +87,7 @@ sub DumpNames(\%$) { # Hashes. foreach $symname ( sort keys %$package ) { local *sym = $$package{$symname}; - next unless ( defined %sym ); + next unless ( %sym ); next if ( $symname =~ /::/ ); &dumpvarslog("Hash '$packname' \%$symname"); -- 2.39.5