Fix some Perl deprecation warnings. Patches from xim.

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index c8130848303fb64a5b72a900daf64332772c3f0b..760e2421206d27eb49da9295e25ce300ceb82b75 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -88,7 +88,7 @@ sub handler {
                
        my %settings = %defsettings;
 
-       for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author) {
+       for my $s (qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author)) {
                my $val = $apr->param($s);
                if (defined($val) && $val =~ /^(\d+)$/) {
                        $settings{$s} = $val;

diff --git a/perl/Sesse/pr0n/Templates.pm b/perl/Sesse/pr0n/Templates.pm
index 3e65a9a9217767f9bb7592a4e6f917023c3aacea..8bf0c1f71226ce69d16d38e8e46ebfb7ac75f581 100644 (file)
--- a/perl/Sesse/pr0n/Templates.pm
+++ b/perl/Sesse/pr0n/Templates.pm
@@ -14,12 +14,11 @@ BEGIN {
        %EXPORT_TAGS = qw();
        @EXPORT_OK   = qw();
 }
-our %dirs;
+our %dirs = ();
 
 sub update_dirs {
        my $r = shift;
        my $base = $r->dir_config('TemplateBase');
-       %dirs = ();
        
        for my $dir (<$base/*>) {
                next unless -d $dir;
@@ -33,7 +32,7 @@ sub update_dirs {
 sub r_to_dir {
        my $r = shift;
 
-       if (!defined(%dirs)) {
+       if (scalar(keys %dirs) == 0) {
                update_dirs($r);
        }