s/$args/$optargs/ since $args is ambigous. To clarify $args usage,

we use $args and $optargs.

10 files changed, 37 insertions, 37 deletions

diff --git a/fml/lib/FML/Command.pm b/fml/lib/FML/Command.pm
index 3a8d9f27..a7d2ef4e 100644
--- a/fml/lib/FML/Command.pm
+++ b/fml/lib/FML/Command.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Command.pm,v 1.4 2001/04/03 09:45:40 fukachan Exp $
+# $FML: Command.pm,v 1.5 2001/05/27 14:27:53 fukachan Exp $
 #
 
 package FML::Command;
@@ -54,7 +54,7 @@ sub DESTROY { ;}
 
 sub AUTOLOAD
 {
-    my ($self, $curproc, $args) = @_;
+    my ($self, $curproc, $optargs) = @_;
 
     return if $AUTOLOAD =~ /DESTROY/;
 
@@ -67,7 +67,7 @@ sub AUTOLOAD
     unless ($@) {
 	if ($pkg->can($command)) {
 	    $curproc->lock() if $self->require_lock($command);
-	    $pkg->$command($curproc, $args);
+	    $pkg->$command($curproc, $optargs);
 	    $curproc->unlock() if $self->require_lock($command);
 	}
 	else {
diff --git a/fml/lib/FML/Command/add.pm b/fml/lib/FML/Command/add.pm
index 776c58fa..93a53187 100644
--- a/fml/lib/FML/Command/add.pm
+++ b/fml/lib/FML/Command/add.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: add.pm,v 1.5 2001/04/03 09:45:41 fukachan Exp $
+# $FML: add.pm,v 1.6 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::add;
@@ -17,8 +17,8 @@ use FML::Command::subscribe;
 
 sub add
 {
-    my ($self, $curproc, $args) = @_;
-    $self->SUPER::subscribe($curproc, $args);
+    my ($self, $curproc, $optargs) = @_;
+    $self->SUPER::subscribe($curproc, $optargs);
 }
 
 =head1 NAME
diff --git a/fml/lib/FML/Command/bye.pm b/fml/lib/FML/Command/bye.pm
index ca703ff3..46427c87 100644
--- a/fml/lib/FML/Command/bye.pm
+++ b/fml/lib/FML/Command/bye.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: bye.pm,v 1.6 2001/04/03 09:45:41 fukachan Exp $
+# $FML: bye.pm,v 1.7 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::bye;
@@ -17,8 +17,8 @@ use FML::Command::unsubscribe;
 
 sub bye
 {
-    my ($self, $curproc, $args) = @_;
-    $self->SUPER::unsubscribe($curproc, $args);
+    my ($self, $curproc, $optargs) = @_;
+    $self->SUPER::unsubscribe($curproc, $optargs);
 }
 
 
diff --git a/fml/lib/FML/Command/edit.pm b/fml/lib/FML/Command/edit.pm
index c08ea032..c480f446 100644
--- a/fml/lib/FML/Command/edit.pm
+++ b/fml/lib/FML/Command/edit.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: edit.pm,v 1.2 2001/07/15 08:14:45 fukachan Exp $
+# $FML: edit.pm,v 1.3 2001/07/15 11:45:39 fukachan Exp $
 #
 
 package FML::Command::edit;
@@ -31,14 +31,14 @@ See C<FML::Command> for more details.
 
 sub edit
 {
-    my ($self, $curproc, $args) = @_;
+    my ($self, $curproc, $optargs) = @_;
     my $config        = $curproc->{ config };
-    my $options       = $args->{ options };
-    my $address       = $args->{ address } || $options->[ 0 ];
-    my $myname        = $args->{ args }->{ myname };
+    my $options       = $optargs->{ options };
+    my $address       = $optargs->{ address } || $options->[ 0 ];
+    my $myname        = $optargs->{ args }->{ myname };
 
     # ML's home directory
-    my $ml_home_dir   = $args->{ 'args' }->{ 'ml_home_dir' };
+    my $ml_home_dir   = $optargs->{ 'args' }->{ 'ml_home_dir' };
     my $config_cf     = $ml_home_dir."/config.cf";
 
     use FML::Config;
diff --git a/fml/lib/FML/Command/newml.pm b/fml/lib/FML/Command/newml.pm
index e58a94c7..a3773c14 100644
--- a/fml/lib/FML/Command/newml.pm
+++ b/fml/lib/FML/Command/newml.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: newml.pm,v 1.5 2001/04/03 09:45:42 fukachan Exp $
+# $FML: newml.pm,v 1.6 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::newml;
@@ -20,7 +20,7 @@ FML::Command::newml - make a new mailing list
 
     use FML::Command::newml;
     $obj = new FML::Command::newml;
-    $obj->newml($curproc, $args);
+    $obj->newml($curproc, $optargs);
 
 See C<FML::Command> for more details.
 
@@ -28,19 +28,19 @@ See C<FML::Command> for more details.
 
 =head1 METHODS
 
-=head2 C<newml($curproc, $args)>
+=head2 C<newml($curproc, $optargs)>
 
 =cut
 
 
 sub newml
 {
-    my ($self, $curproc, $args) = @_;
+    my ($self, $curproc, $optargs) = @_;
     my $config        = $curproc->{ config };
     my $main_cf       = $curproc->{ main_cf };
     my $member_map    = $config->{ primary_member_map };
     my $recipient_map = $config->{ primary_recipient_map };
-    my $ml_name       = $args->{ ml_name };
+    my $ml_name       = $optargs->{ ml_name };
 
     # fundamental check
     croak("\$ml_name is not specified")    unless $ml_name;
diff --git a/fml/lib/FML/Command/remove.pm b/fml/lib/FML/Command/remove.pm
index 439d45f8..2c5ecbb4 100644
--- a/fml/lib/FML/Command/remove.pm
+++ b/fml/lib/FML/Command/remove.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: remove.pm,v 1.5 2001/04/03 09:45:42 fukachan Exp $
+# $FML: remove.pm,v 1.6 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::remove;
@@ -17,8 +17,8 @@ use FML::Command::unsubscribe;
 
 sub remove
 {
-    my ($self, $curproc, $args) = @_;
-    $self->SUPER::unsubscribe($curproc, $args);
+    my ($self, $curproc, $optargs) = @_;
+    $self->SUPER::unsubscribe($curproc, $optargs);
 }
 
 
diff --git a/fml/lib/FML/Command/resign.pm b/fml/lib/FML/Command/resign.pm
index 71ea8d37..b8049be2 100644
--- a/fml/lib/FML/Command/resign.pm
+++ b/fml/lib/FML/Command/resign.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: resign.pm,v 1.5 2001/04/03 09:45:42 fukachan Exp $
+# $FML: resign.pm,v 1.6 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::resign;
@@ -17,8 +17,8 @@ use FML::Command::unsubscribe;
 
 sub resign
 {
-    my ($self, $curproc, $args) = @_;
-    $self->unsubscribe($curproc, $args);
+    my ($self, $curproc, $optargs) = @_;
+    $self->unsubscribe($curproc, $optargs);
 }
 
 =head1 NAME
diff --git a/fml/lib/FML/Command/signoff.pm b/fml/lib/FML/Command/signoff.pm
index 1218bb3b..79d3b87d 100644
--- a/fml/lib/FML/Command/signoff.pm
+++ b/fml/lib/FML/Command/signoff.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: signoff.pm,v 1.1 2001/04/05 10:39:08 fukachan Exp $
+# $FML: signoff.pm,v 1.2 2001/06/17 08:57:10 fukachan Exp $
 #
 
 package FML::Command::signoff;
@@ -17,8 +17,8 @@ use FML::Command::unsubscribe;
 
 sub signoff
 {
-    my ($self, $curproc, $args) = @_;
-    $self->SUPER::unsubscribe($curproc, $args);
+    my ($self, $curproc, $optargs) = @_;
+    $self->SUPER::unsubscribe($curproc, $optargs);
 }
 
 
diff --git a/fml/lib/FML/Command/subscribe.pm b/fml/lib/FML/Command/subscribe.pm
index 6db06362..e85b08d9 100644
--- a/fml/lib/FML/Command/subscribe.pm
+++ b/fml/lib/FML/Command/subscribe.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: subscribe.pm,v 1.8 2001/05/04 14:32:32 fukachan Exp $
+# $FML: subscribe.pm,v 1.9 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::subscribe;
@@ -31,12 +31,12 @@ See C<FML::Command> for more details.
 
 sub subscribe
 {
-    my ($self, $curproc, $args) = @_;
+    my ($self, $curproc, $optargs) = @_;
     my $config        = $curproc->{ config };
     my $member_map    = $config->{ primary_member_map };
     my $recipient_map = $config->{ primary_recipient_map };
-    my $options       = $args->{ options };
-    my $address       = $args->{ address } || $options->[ 0 ];
+    my $options       = $optargs->{ options };
+    my $address       = $optargs->{ address } || $options->[ 0 ];
 
     # fundamental check
     croak("\$member_map is not specified")    unless $member_map;
diff --git a/fml/lib/FML/Command/unsubscribe.pm b/fml/lib/FML/Command/unsubscribe.pm
index d425357b..62b597bf 100644
--- a/fml/lib/FML/Command/unsubscribe.pm
+++ b/fml/lib/FML/Command/unsubscribe.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: unsubscribe.pm,v 1.8 2001/05/04 14:32:32 fukachan Exp $
+# $FML: unsubscribe.pm,v 1.9 2001/05/27 14:27:54 fukachan Exp $
 #
 
 package FML::Command::unsubscribe;
@@ -29,12 +29,12 @@ See C<FML::Command> for more details.
 
 sub unsubscribe
 {
-    my ($self, $curproc, $args) = @_;
+    my ($self, $curproc, $optargs) = @_;
     my $config        = $curproc->{ config };
     my $member_map    = $config->{ primary_member_map };
     my $recipient_map = $config->{ primary_recipient_map };
-    my $options       = $args->{ options };
-    my $address       = $args->{ address } || $options->[ 0 ];
+    my $options       = $optargs->{ options };
+    my $address       = $optargs->{ address } || $options->[ 0 ];
 
     # fundamental check
     croak("\$member_map is not specified")    unless $member_map;