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 c494f59b3a60cc9b1098663b009f26b6acf0501e..d540004e638f2c9ad2051dc487a37433f50f5549 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -34,7 +34,7 @@ use Carp;
 use strict;
 use vars qw(%channels %valid);
 
-%channels = undef;
+%channels = ();
 
 %valid = (
                  call => '0,Callsign',
@@ -49,7 +49,7 @@ use vars qw(%channels %valid);
                  list => '9,Dep Chan List',
                  name => '0,User Name',
                  consort => '9,Connection Type',
-                 sort => '9,Type of Channel',
+                 'sort' => '9,Type of Channel',
                  wwv => '0,Want WWV,yesno',
                  talk => '0,Want Talk,yesno',
                  ann => '0,Want Announce,yesno',
@@ -87,6 +87,7 @@ sub alloc
        $self->{lang} = $main::lang if !$self->{lang};
        $user->new_group() if !$user->group;
        $self->{group} = $user->group;
+       $self->{func} = "";
        bless $self, $pkg; 
        return $channels{$call} = $self;
 }
@@ -130,21 +131,21 @@ sub del
 sub is_ak1a
 {
        my $self = shift;
-       return $self->{sort} eq 'A';
+       return $self->{'sort'} eq 'A';
 }
 
 # is it a user?
 sub is_user
 {
        my $self = shift;
-       return $self->{sort} eq 'U';
+       return $self->{'sort'} eq 'U';
 }
 
 # is it a connect type
 sub is_connect
 {
        my $self = shift;
-       return $self->{sort} eq 'C';
+       return $self->{'sort'} eq 'C';
 }
 
 # handle out going messages, immediately without waiting for the select to drop
@@ -155,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;
 }
@@ -173,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;
 }
@@ -211,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};