summaryrefslogtreecommitdiff
path: root/fml/lib/FML
diff options
context:
space:
mode:
authorfukachan <fukachan>2005-08-10 15:03:23 +0000
committerfukachan <fukachan>2005-08-10 15:03:23 +0000
commit25438601b2819cf7f66f00e5aa81943a3ccc2bfe (patch)
treebd60c916092fc759c2be6f78458c9f8c542e39c1 /fml/lib/FML
parentbf6f4cba2e6df2d9cd218296072c232b2b9d9898 (diff)
downloadfml8-25438601b2819cf7f66f00e5aa81943a3ccc2bfe.tar.gz
fml8-25438601b2819cf7f66f00e5aa81943a3ccc2bfe.tar.bz2
fml8-25438601b2819cf7f66f00e5aa81943a3ccc2bfe.zip
config_files_XXX() -> config_cf_files_XXX() to clarify the meaning.
Diffstat (limited to 'fml/lib/FML')
-rw-r--r--fml/lib/FML/Process/Addr.pm4
-rw-r--r--fml/lib/FML/Process/Alias.pm4
-rw-r--r--fml/lib/FML/Process/CGI/Kernel.pm6
-rw-r--r--fml/lib/FML/Process/Calendar.pm4
-rw-r--r--fml/lib/FML/Process/Command.pm4
-rw-r--r--fml/lib/FML/Process/ConfViewer.pm4
-rw-r--r--fml/lib/FML/Process/Configure.pm4
-rw-r--r--fml/lib/FML/Process/Digest.pm4
-rw-r--r--fml/lib/FML/Process/Distribute.pm4
-rw-r--r--fml/lib/FML/Process/DocViewer.pm4
-rw-r--r--fml/lib/FML/Process/Emulate.pm4
-rw-r--r--fml/lib/FML/Process/Error.pm4
-rw-r--r--fml/lib/FML/Process/Fake.pm4
-rw-r--r--fml/lib/FML/Process/FetchFML.pm4
-rw-r--r--fml/lib/FML/Process/HTMLify.pm4
-rw-r--r--fml/lib/FML/Process/Kernel.pm10
-rw-r--r--fml/lib/FML/Process/PGP.pm4
-rw-r--r--fml/lib/FML/Process/Utils.pm16
18 files changed, 46 insertions, 46 deletions
diff --git a/fml/lib/FML/Process/Addr.pm b/fml/lib/FML/Process/Addr.pm
index b3ec4c48..bae4bea1 100644
--- a/fml/lib/FML/Process/Addr.pm
+++ b/fml/lib/FML/Process/Addr.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Addr.pm,v 1.20 2005/05/27 03:03:36 fukachan Exp $
+# $FML: Addr.pm,v 1.21 2005/06/04 08:49:08 fukachan Exp $
#
package FML::Process::Addr;
@@ -80,7 +80,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
# $curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$eval = $config->get_hook( 'fmladdr_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Alias.pm b/fml/lib/FML/Process/Alias.pm
index 694f7618..8e824d03 100644
--- a/fml/lib/FML/Process/Alias.pm
+++ b/fml/lib/FML/Process/Alias.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Alias.pm,v 1.21 2005/06/04 08:49:08 fukachan Exp $
+# $FML: Alias.pm,v 1.22 2005/06/04 08:51:30 fukachan Exp $
#
package FML::Process::Alias;
@@ -80,7 +80,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
# $curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$eval = $config->get_hook( 'fmlalias_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm
index 90a1f293..7657ea5b 100644
--- a/fml/lib/FML/Process/CGI/Kernel.pm
+++ b/fml/lib/FML/Process/CGI/Kernel.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: Kernel.pm,v 1.85 2005/05/27 01:19:32 fukachan Exp $
+# $FML: Kernel.pm,v 1.86 2005/06/04 08:49:12 fukachan Exp $
#
package FML::Process::CGI::Kernel;
@@ -91,7 +91,7 @@ sub prepare
my ($curproc, $args) = @_;
$curproc->_cgi_ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
# modified for admin/*.cgi
@@ -207,7 +207,7 @@ sub _cgi_ml_variables_resolve
# XXX-TODO: method name .. hmm. $curproc->$obj_$function().
# add this ml's config.cf to the .cf list.
- $curproc->config_files_append($config_cf);
+ $curproc->config_cf_files_append($config_cf);
}
else {
$curproc->logdebug("no ml_name");
diff --git a/fml/lib/FML/Process/Calendar.pm b/fml/lib/FML/Process/Calendar.pm
index c2125068..05c72772 100644
--- a/fml/lib/FML/Process/Calendar.pm
+++ b/fml/lib/FML/Process/Calendar.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Calendar.pm,v 1.16 2005/05/27 03:03:36 fukachan Exp $
+# $FML: Calendar.pm,v 1.17 2005/06/04 08:49:08 fukachan Exp $
#
package FML::Process::Calendar;
@@ -88,7 +88,7 @@ sub prepare
# load default configurations.
use FML::Config;
$curproc->{ config } = new FML::Config;
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
}
diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm
index 0cc5b52c..23591905 100644
--- a/fml/lib/FML/Process/Command.pm
+++ b/fml/lib/FML/Process/Command.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Command.pm,v 1.112 2005/05/27 00:57:18 fukachan Exp $
+# $FML: Command.pm,v 1.113 2005/06/04 08:49:08 fukachan Exp $
#
package FML::Process::Command;
@@ -84,7 +84,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/ConfViewer.pm b/fml/lib/FML/Process/ConfViewer.pm
index f6a9a9c4..b394ef5a 100644
--- a/fml/lib/FML/Process/ConfViewer.pm
+++ b/fml/lib/FML/Process/ConfViewer.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: ConfViewer.pm,v 1.32 2005/05/27 03:03:37 fukachan Exp $
+# $FML: ConfViewer.pm,v 1.33 2005/06/04 08:49:09 fukachan Exp $
#
package FML::Process::ConfViewer;
@@ -77,7 +77,7 @@ sub prepare
}
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$eval = $config->get_hook( 'fmlconf_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm
index 852a175e..4296df5c 100644
--- a/fml/lib/FML/Process/Configure.pm
+++ b/fml/lib/FML/Process/Configure.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Configure.pm,v 1.68 2005/05/26 12:39:11 fukachan Exp $
+# $FML: Configure.pm,v 1.69 2005/06/04 08:49:09 fukachan Exp $
#
package FML::Process::Configure;
@@ -77,7 +77,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/Digest.pm b/fml/lib/FML/Process/Digest.pm
index e964b9eb..c24dd21b 100644
--- a/fml/lib/FML/Process/Digest.pm
+++ b/fml/lib/FML/Process/Digest.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Digest.pm,v 1.22 2005/06/04 08:49:09 fukachan Exp $
+# $FML: Digest.pm,v 1.23 2005/06/04 08:51:30 fukachan Exp $
#
package FML::Process::Digest;
@@ -81,7 +81,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index 06f5eedb..7527a52d 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Distribute.pm,v 1.159 2005/05/27 00:59:13 fukachan Exp $
+# $FML: Distribute.pm,v 1.160 2005/06/04 08:49:10 fukachan Exp $
#
package FML::Process::Distribute;
@@ -81,7 +81,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm
index 7947603b..89199670 100644
--- a/fml/lib/FML/Process/DocViewer.pm
+++ b/fml/lib/FML/Process/DocViewer.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: DocViewer.pm,v 1.34 2005/05/26 10:22:58 fukachan Exp $
+# $FML: DocViewer.pm,v 1.35 2005/06/04 08:49:10 fukachan Exp $
#
package FML::Process::DocViewer;
@@ -80,7 +80,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
# $curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$eval = $config->get_hook( 'fmldoc_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Emulate.pm b/fml/lib/FML/Process/Emulate.pm
index 8f769088..72e5425c 100644
--- a/fml/lib/FML/Process/Emulate.pm
+++ b/fml/lib/FML/Process/Emulate.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Emulate.pm,v 1.7 2005/06/04 08:54:53 fukachan Exp $
+# $FML: Emulate.pm,v 1.8 2005/08/10 11:28:44 fukachan Exp $
#
package FML::Process::Emulate;
@@ -85,7 +85,7 @@ sub prepare
# go !
$curproc->ml_variables_resolve($resolver_args);
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm
index 3dd110e6..2f2374f6 100644
--- a/fml/lib/FML/Process/Error.pm
+++ b/fml/lib/FML/Process/Error.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Error.pm,v 1.51 2005/06/04 01:35:26 fukachan Exp $
+# $FML: Error.pm,v 1.52 2005/06/04 08:49:10 fukachan Exp $
#
package FML::Process::Error;
@@ -77,7 +77,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/Fake.pm b/fml/lib/FML/Process/Fake.pm
index 2c554b4e..6c472a14 100644
--- a/fml/lib/FML/Process/Fake.pm
+++ b/fml/lib/FML/Process/Fake.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Fake.pm,v 1.12 2005/05/30 07:20:23 fukachan Exp $
+# $FML: Fake.pm,v 1.13 2005/06/04 08:55:57 fukachan Exp $
#
package FML::Process::Fake;
@@ -221,7 +221,7 @@ sub _faker_init
$config->set('ml_home_dir', $ml_home_dir);
# init
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/FetchFML.pm b/fml/lib/FML/Process/FetchFML.pm
index 869890bc..bc30146f 100644
--- a/fml/lib/FML/Process/FetchFML.pm
+++ b/fml/lib/FML/Process/FetchFML.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: FetchFML.pm,v 1.1 2005/06/03 11:00:55 fukachan Exp $
+# $FML: FetchFML.pm,v 1.2 2005/06/04 08:49:10 fukachan Exp $
#
package FML::Process::FetchFML;
@@ -78,7 +78,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$curproc->scheduler_init();
$curproc->log_message_init();
diff --git a/fml/lib/FML/Process/HTMLify.pm b/fml/lib/FML/Process/HTMLify.pm
index c08f380b..bf9ae779 100644
--- a/fml/lib/FML/Process/HTMLify.pm
+++ b/fml/lib/FML/Process/HTMLify.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: HTMLify.pm,v 1.37 2005/06/04 08:49:11 fukachan Exp $
+# $FML: HTMLify.pm,v 1.38 2005/06/04 08:51:30 fukachan Exp $
#
package FML::Process::HTMLify;
@@ -71,7 +71,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$eval = $config->get_hook( 'fmlhtmlify_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index 11a8b878..c1ef1d9d 100644
--- a/fml/lib/FML/Process/Kernel.pm
+++ b/fml/lib/FML/Process/Kernel.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: Kernel.pm,v 1.262 2005/08/10 12:55:33 fukachan Exp $
+# $FML: Kernel.pm,v 1.263 2005/08/10 13:09:46 fukachan Exp $
#
package FML::Process::Kernel;
@@ -890,7 +890,7 @@ sub ml_variables_resolve
$curproc->__debug_ml_xxx('resolv:');
# add this ml's config.cf to the .cf list.
- $curproc->config_files_append($config_cf_path);
+ $curproc->config_cf_files_append($config_cf_path);
}
else {
$curproc->logerror("cannot determine which ml_name");
@@ -992,7 +992,7 @@ sub _find_ml_home_dir_in_argv
}
-=head2 config_files_load($files)
+=head2 config_cf_files_load($files)
read several configuration C<@$files>.
The variable evaluation (expansion) is done on demand when
@@ -1004,11 +1004,11 @@ $config->get() of FETCH() method is called.
# Arguments: OBJ($curproc) ARRAY_REF($files)
# Side Effects: none
# Return Value: none
-sub config_files_load
+sub config_cf_files_load
{
my ($curproc, $files) = @_;
my $config = $curproc->config();
- my $_files = $files || $curproc->config_files_get_list();
+ my $_files = $files || $curproc->config_cf_files_get_list();
# load configuration variables from given files e.g. /some/where.cf
# XXX overload variables from each $cf
diff --git a/fml/lib/FML/Process/PGP.pm b/fml/lib/FML/Process/PGP.pm
index 947029fc..e5127912 100644
--- a/fml/lib/FML/Process/PGP.pm
+++ b/fml/lib/FML/Process/PGP.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2005 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: PGP.pm,v 1.3 2005/06/04 08:49:11 fukachan Exp $
+# $FML: PGP.pm,v 1.4 2005/08/06 07:48:04 fukachan Exp $
#
package FML::Process::PGP;
@@ -77,7 +77,7 @@ sub prepare
if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
$curproc->ml_variables_resolve();
- $curproc->config_files_load();
+ $curproc->config_cf_files_load();
$curproc->env_fix_perl_include_path();
$eval = $config->get_hook( 'fmlpgp_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm
index 4075563d..6cb61c75 100644
--- a/fml/lib/FML/Process/Utils.pm
+++ b/fml/lib/FML/Process/Utils.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: Utils.pm,v 1.131 2005/06/03 09:38:13 fukachan Exp $
+# $FML: Utils.pm,v 1.132 2005/06/04 08:28:46 fukachan Exp $
#
package FML::Process::Utils;
@@ -962,15 +962,15 @@ sub command_line_options
}
-=head2 config_files_set_list($cf_file_path_array)
+=head2 config_cf_files_set_list($cf_file_path_array)
set configuration file (.cf) to internal list.
-=head2 config_files_append($cf_file_path)
+=head2 config_cf_files_append($cf_file_path)
append configuration file (.cf) to internal list.
-=head2 config_files_get_list()
+=head2 config_cf_files_get_list()
get configuration files (*.cf) list as ARRAY_REF.
@@ -981,7 +981,7 @@ get configuration files (*.cf) list as ARRAY_REF.
# Arguments: OBJ($curproc) ARRAY_REF($path)
# Side Effects: none
# Return Value: ARRAY_REF
-sub config_files_set_list
+sub config_cf_files_set_list
{
my ($curproc, $path) = @_;
my $args = $curproc->{ __parent_args };
@@ -990,7 +990,7 @@ sub config_files_set_list
$args->{ cf_list } = $path || [];
}
else {
- $curproc->logerror("config_files_set_list: invalid input");
+ $curproc->logerror("config_cf_files_set_list: invalid input");
}
}
@@ -998,7 +998,7 @@ sub config_files_set_list
# Arguments: OBJ($curproc) STR($path)
# Side Effects: none
# Return Value: ARRAY_REF
-sub config_files_append
+sub config_cf_files_append
{
my ($curproc, $path) = @_;
my $args = $curproc->{ __parent_args };
@@ -1012,7 +1012,7 @@ sub config_files_append
# Arguments: OBJ($curproc)
# Side Effects: none
# Return Value: ARRAY_REF
-sub config_files_get_list
+sub config_cf_files_get_list
{
my ($curproc) = @_;
my $args = $curproc->{ __parent_args };