some final warnings removed

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index b8ff16d1b3ba50605316a2f645f85e9929e6d5a2..be6dfb4d308e2152e158000a9ddb41582bcc02df 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -222,7 +222,7 @@ sub phash
        my $ref = shift;
        my $out;
 
-       while (my $k = sort keys %$ref) {
+       foreach my $k (sort keys %$ref) {
                $out .= "${k}=>$ref->{$k}, ";
        }
        $out =~ s/, $// if $out;
@@ -565,8 +565,11 @@ sub difft
                }
        }
        return '-(ve)' if $t < 0;
-       my ($d,$h,$m,$s);
+       my ($y,$d,$h,$m,$s);
        my $out = '';
+       $y = int $t / (86400*365);
+       $out .= sprintf ("%s${y}y", $adds?' ':'') if $y;
+       $t -= $y * 86400 * 365;
        $d = int $t / 86400;
        $out .= sprintf ("%s${d}d", $adds?' ':'') if $d;
        $t -= $d * 86400;