1. Various detail changes to remove some more warning with -w on

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 7319344caeb51fa8bda7770f5c12f397f685e7c6..d540004e638f2c9ad2051dc487a37433f50f5549 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -156,12 +156,11 @@ sub send_now
        my $conn = $self->{conn};
        my $sort = shift;
        my $call = $self->{call};
-       my $line;
        
-       foreach $line (@_) {
-               chomp $line;
-               $conn->send_now("$sort$call|$line") if $conn;
-               dbg('chan', "-> $sort $call $line") if $conn;
+       for (@_) {
+               chomp;
+               $conn->send_now("$sort$call|$_") if $conn;
+               dbg('chan', "-> $sort $call $_") if $conn;
        }
        $self->{t} = time;
 }
@@ -174,12 +173,11 @@ sub send                                          # this is always later and always data
        my $self = shift;
        my $conn = $self->{conn};
        my $call = $self->{call};
-       my $line;
 
-       foreach $line (@_) {
-               chomp $line;
-               $conn->send_later("D$call|$line") if $conn;
-               dbg('chan', "-> D $call $line") if $conn;
+       for (@_) {
+               chomp;
+               $conn->send_later("D$call|$_") if $conn;
+               dbg('chan', "-> D $call $_") if $conn;
        }
        $self->{t} = time;
 }
@@ -212,6 +210,7 @@ sub state
        if (@_) {
                $self->{oldstate} = $self->{state};
                $self->{state} = shift;
+               $self->{func} = '' unless defined $self->{func};
                dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
        }
        return $self->{state};