$optargs -> $command_args

3 files changed, 19 insertions, 19 deletions

diff --git a/fml/lib/FML/Command.pm b/fml/lib/FML/Command.pm
index 891da2fe..dd759b0e 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.9 2001/10/10 14:58:45 fukachan Exp $
+# $FML: Command.pm,v 1.10 2001/10/13 02:33:12 fukachan Exp $
 #
 
 package FML::Command;
@@ -55,8 +55,8 @@ sub DESTROY { ;}
 
 sub AUTOLOAD
 {
-    my ($self, $curproc, $optargs) = @_;
-    my $mode = $optargs->{ 'command_mode' } =~ /admin/i ? 'Admin' : 'User';
+    my ($self, $curproc, $command_args) = @_;
+    my $mode = $command_args->{ 'command_mode' } =~ /admin/i ? 'Admin' : 'User';
 
     return if $AUTOLOAD =~ /DESTROY/;
 
@@ -71,12 +71,12 @@ sub AUTOLOAD
 	my $command = $pkg->new();
 
 	if ($command->can('auth')) {
-	    $command->auth($curproc, $optargs);
+	    $command->auth($curproc, $command_args);
 	}
 
 	if ($command->can('process')) {
 	    $curproc->lock() if $self->require_lock($comname);
-	    $command->process($curproc, $optargs);
+	    $command->process($curproc, $command_args);
 	    $curproc->unlock() if $self->require_lock($comname);
 
 	    if ($command->error()) { Log($command->error());}
diff --git a/fml/lib/FML/Command/SendFile.pm b/fml/lib/FML/Command/SendFile.pm
index c3c751f0..d3d8129b 100644
--- a/fml/lib/FML/Command/SendFile.pm
+++ b/fml/lib/FML/Command/SendFile.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: SendFile.pm,v 1.1 2001/10/13 12:17:49 fukachan Exp $
+# $FML: SendFile.pm,v 1.2 2001/10/13 13:10:34 fukachan Exp $
 #
 
 package FML::Command::SendFile;
@@ -27,7 +27,7 @@ not yet implemented
 
 =head1 METHODS
 
-=head2 C<send_article($curproc, $optargs)>
+=head2 C<send_article($curproc, $command_args)>
 
 send back articles.
 
@@ -40,13 +40,13 @@ modules.
 =cut
 
 # Descriptions: send back articles
-#    Arguments: $self $curproc $optargs
+#    Arguments: $self $curproc $command_args
 # Side Effects: none
 # Return Value: none
 sub send_article
 {
-    my ($self, $curproc, $optargs) = @_;
-    my $command   = $optargs->{ command };
+    my ($self, $curproc, $command_args) = @_;
+    my $command   = $command_args->{ command };
     my $config    = $curproc->{ config };
     my $ml_name   = $config->{ ml_name };
     my $spool_dir = $config->{ spool_dir };
@@ -102,20 +102,20 @@ sub _is_valid_argument
 }
 
 
-=head2 C<send_file($curproc, $optargs)>
+=head2 C<send_file($curproc, $command_args)>
 
-send back file specified as C<$optargs->{ _file_to_send }>.
+send back file specified as C<$command_args->{ _file_to_send }>.
 
 =cut
 
 # Descriptions: 
-#    Arguments: $self $curproc $optargs
+#    Arguments: $self $curproc $command_args
 # Side Effects: none
 # Return Value: none
 sub send_file
 {
-    my ($self, $curproc, $optargs) = @_;
-    my $what_file = $optargs->{ _file_to_send };
+    my ($self, $curproc, $command_args) = @_;
+    my $what_file = $command_args->{ _file_to_send };
     my $config    = $curproc->{ config };
     my $charset   = $config->{ reply_message_charset };
 
diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm
index 788a8f82..5168d56a 100644
--- a/fml/lib/FML/Process/Configure.pm
+++ b/fml/lib/FML/Process/Configure.pm
@@ -4,7 +4,7 @@
 # Copyright (C) 2000,2001 Ken'ichi Fukamachi
 #          All rights reserved. 
 #
-# $FML: Configure.pm,v 1.24 2001/07/15 12:02:12 fukachan Exp $
+# $FML: Configure.pm,v 1.25 2001/08/26 08:41:58 fukachan Exp $
 #
 
 package FML::Process::Configure;
@@ -145,7 +145,7 @@ C<@$argv> ( $argv = $args->{ ARGV } ).
 
 C<Caution:>
 C<$args> is passed from parrent libexec/loader.
-We construct a new struct C<$optargs> here to pass parameters 
+We construct a new struct C<$command_args> here to pass parameters 
 to child objects.
 C<FML::Command::$command> object takes them as arguments not pure
 C<$args>. It is a little mess. Pay attention.
@@ -169,7 +169,7 @@ sub _makefml
     my ($method, $ml_name, @options) =  @$argv;
 
     # arguments to pass off to each method
-    my $optargs = {
+    my $command_args = {
 	command_mode => 'admin',
 	command      => $method,
 	ml_name      => $ml_name,
@@ -181,7 +181,7 @@ sub _makefml
     # here we go
     require FML::Command;
     my $obj = new FML::Command;
-    $obj->$method($curproc, $optargs);
+    $obj->$method($curproc, $command_args);
 }