remove references to iscallsign

diff --git a/Changes b/Changes
index 3de9f88122c3fc27c91501832e31e70f8cda006f..81382122264760a88ef92ad3e18d9ad1ce95df07 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 04Nov00=======================================================================
 1. fix sh/filter so ity now works for any callsign (and not just connected
 ones).
+2. Have only one is_callsign and not an iscallsign as well.
 03Nov00=======================================================================
 1. allow - in filter strings
 2. store only the filter expression NOTE BENE: you will need to clear all 

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 60351bd40885e8fe1e7005ceec375342bb5a80cc..75ae1befe21a75d4ba4f48fbcaf61c284f1ae0eb 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -203,7 +203,7 @@ sub process
 
                        # look to see whether this is a non private message sent to a known callsign
                        my $uref = DXUser->get_current($ref->{to});
-                       if (iscallsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
+                       if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
                                $ref->{private} = 1;
                                dbg('msg', "set bull to $ref->{to} to private");
                        }

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index b1d2b6292bef8873596676a14b58402570759836..2e8a528475ba9bcc75517512d36d5dc94440b6f4 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -16,7 +16,7 @@ require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
                         parray parraypairs shellregex readfilestr writefilestr
-             print_all_fields cltounix iscallsign unpad is_callsign
+             print_all_fields cltounix unpad is_callsign
                         is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 

diff --git a/perl/client.pl b/perl/client.pl
index ff2ca473f82b03451e0f023d7d72d3ee6e9adc5b..b36be34715282605f542948529e1c2f96e375dc4 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -419,7 +419,7 @@ if ($loginreq) {
        $s =~ s/\s+//og;
        $s =~ s/-\d+$//o;            # no ssids!
        cease(0) unless $s && $s gt ' ';
-       unless (iscallsign($s)) {
+       unless (is_callsign($s)) {
                $stdout->print("Sorry, $s is an invalid callsign");
                cease(0);
        }