FNF: XXX_clean_up() -> XXX_cleanup()

20 files changed, 74 insertions, 74 deletions

diff --git a/fml/lib/FML/Article/Summary.pm b/fml/lib/FML/Article/Summary.pm
index bdd640e6..a1823fc5 100644
--- a/fml/lib/FML/Article/Summary.pm
+++ b/fml/lib/FML/Article/Summary.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: Summary.pm,v 1.23 2005/05/26 09:42:24 fukachan Exp $
+# $FML: Summary.pm,v 1.24 2005/08/11 04:11:25 fukachan Exp $
 #
 
 package FML::Article::Summary;
@@ -108,7 +108,7 @@ sub _prepare_info
 	if ($address) {
 	    use Mail::Message::Address;
 	    my $addr = new Mail::Message::Address $address;
-	    $addr->clean_up();
+	    $addr->cleanup();
 	    $address = $addr->substr(0, $addrlen) || '';
 	}
 
diff --git a/fml/lib/FML/Command/DataCheck.pm b/fml/lib/FML/Command/DataCheck.pm
index 4d8f7749..5a746311 100644
--- a/fml/lib/FML/Command/DataCheck.pm
+++ b/fml/lib/FML/Command/DataCheck.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: DataCheck.pm,v 1.16 2004/06/26 11:47:55 fukachan Exp $
+# $FML: DataCheck.pm,v 1.17 2005/05/27 03:03:34 fukachan Exp $
 #
 
 package FML::Command::DataCheck;
@@ -55,7 +55,7 @@ sub parse_command_buffer
 {
     my ($self, $command) = @_;
 
-    $command = $self->clean_up($command);
+    $command = $self->cleanup($command);
     my ($comname, $comsubname) = split(/\s+/, $command);
     return ($comname, $comsubname);
 }
@@ -108,8 +108,8 @@ sub find_special_keyword
     my $admin_found    = '';
 
     # clean up
-    $confirm_prefix = $self->clean_up($confirm_prefix);
-    $admin_prefix   = $self->clean_up($admin_prefix);
+    $confirm_prefix = $self->cleanup($confirm_prefix);
+    $admin_prefix   = $self->cleanup($admin_prefix);
 
     # XXX $ra_data is not whole body but already parsed and prepared buffer.
     # XXX See below and FML::Process::Command module, for example.
@@ -181,7 +181,7 @@ sub find_anonymous_command_mail_allowed_commands
 #    Arguments: OBJ($self) STR($s)
 # Side Effects: none
 # Return Value: STR
-sub clean_up
+sub cleanup
 {
     my ($self, $s) = @_;
 
diff --git a/fml/lib/FML/Filter/TextPlain.pm b/fml/lib/FML/Filter/TextPlain.pm
index c6aa8a5e..ab3ad9a2 100644
--- a/fml/lib/FML/Filter/TextPlain.pm
+++ b/fml/lib/FML/Filter/TextPlain.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: TextPlain.pm,v 1.12 2005/05/27 01:47:05 fukachan Exp $
+# $FML: TextPlain.pm,v 1.13 2005/05/30 00:02:31 fukachan Exp $
 #
 
 package FML::Filter::TextPlain;
@@ -141,7 +141,7 @@ sub body_check
     # my $need_one_line_check = $self->need_one_line_check($m);
 
     ## 5. preparation for main rules.
-    ## $self->_clean_up_buffer($m);
+    ## $self->_cleanup_buffer($m);
 
     ## 6. main fules
     my $rules = $self->{ _rules };
@@ -478,7 +478,7 @@ sub is_signature
 }
 
 
-=head2 clean_up_buffer($args)
+=head2 cleanup_buffer($args)
 
 remove some special syntax pattern for further check.
 For example, the pattern is a mail address.
@@ -491,7 +491,7 @@ We remove it and check the remained buffer whether it is safe or not.
 #    Arguments: OBJ($self) STR($xbuf)
 # Side Effects: none
 # Return Value: STR
-sub clean_up_buffer
+sub cleanup_buffer
 {
     my ($self, $xbuf) = @_;
 
diff --git a/fml/lib/FML/Header.pm b/fml/lib/FML/Header.pm
index 6832ac3c..459a6135 100644
--- a/fml/lib/FML/Header.pm
+++ b/fml/lib/FML/Header.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: Header.pm,v 1.83 2005/05/27 03:03:32 fukachan Exp $
+# $FML: Header.pm,v 1.84 2005/08/08 03:53:23 fukachan Exp $
 #
 
 package FML::Header;
@@ -119,7 +119,7 @@ sub set
 }
 
 
-=head2 address_clean_up(address)
+=head2 address_cleanup(address)
 
 clean up given C<address>. This method parses the given address by
 C<Mail::Address::parse()>, remove < and > and return the result.
@@ -128,7 +128,7 @@ C<Mail::Address::parse()>, remove < and > and return the result.
 
 
 #
-# XXX-TODO: address_clean_up() in this class is apporopriate ?
+# XXX-TODO: address_cleanup() in this class is apporopriate ?
 # XXX-TODO: is it in some other class such as FML::Address ?
 #
 
@@ -136,7 +136,7 @@ C<Mail::Address::parse()>, remove < and > and return the result.
 #    Arguments: OBJ($self) STR($addr)
 # Side Effects: none
 # Return Value: STR
-sub address_clean_up
+sub address_cleanup
 {
     my ($self, $addr) = @_;
 
@@ -720,7 +720,7 @@ sub _check_xxx_message_id
     my $dir = $config->{ $mode };
     my $dup = 0;
 
-    $mid = $header->address_clean_up($mid);
+    $mid = $header->address_cleanup($mid);
     if ($mid) {
 	use FML::Header::MessageID;
 	my $xargs = { directory => $dir };
@@ -773,7 +773,7 @@ sub _update_xxx_message_id_cache
     my $dir = $config->{ $mode };
     my $mid = $header->get('message-id');
 
-    $mid = $header->address_clean_up($mid);
+    $mid = $header->address_cleanup($mid);
     if ($mid) {
 	use FML::Header::MessageID;
 	my $xargs = { directory => $dir };
diff --git a/fml/lib/FML/Header/Subject.pm b/fml/lib/FML/Header/Subject.pm
index e473f656..05af5924 100644
--- a/fml/lib/FML/Header/Subject.pm
+++ b/fml/lib/FML/Header/Subject.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: Subject.pm,v 1.49 2005/08/18 10:30:09 fukachan Exp $
+# $FML: Subject.pm,v 1.50 2005/08/19 11:21:14 fukachan Exp $
 #
 
 package FML::Header::Subject;
@@ -101,7 +101,7 @@ sub rewrite_article_subject_tag
 #    Arguments: OBJ($self) STR($subject) STR($tag)
 # Side Effects: none
 # Return Value: STR
-sub clean_up
+sub cleanup
 {
     my ($self, $subject, $tag)   = @_;
     my ($s, $in_code, $out_code) = $self->decode($subject, $tag);
diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm
index 2f2374f6..b8bf10d3 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.52 2005/06/04 08:49:10 fukachan Exp $
+# $FML: Error.pm,v 1.53 2005/08/10 15:03:25 fukachan Exp $
 #
 
 package FML::Process::Error;
@@ -194,7 +194,7 @@ sub run
 
 	if ($found) {
 	    $pcb->set("error", "found", 1);
-	    $curproc->_clean_up_bouncers();
+	    $curproc->_cleanup_bouncers();
 	}
     }
 
@@ -208,7 +208,7 @@ sub run
 #    Arguments: OBJ($curproc)
 # Side Effects: remove addresses which causes bounces
 # Return Value: none
-sub _clean_up_bouncers
+sub _cleanup_bouncers
 {
     my ($curproc) = @_;
     my $channel   = 'error_mail_analyzer';
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index bdacdeda..39c29c81 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.266 2005/08/17 11:53:34 fukachan Exp $
+# $FML: Kernel.pm,v 1.267 2005/08/19 11:23:02 fukachan Exp $
 #
 
 package FML::Process::Kernel;
@@ -2653,7 +2653,7 @@ sub queue_in
 # Descriptions: append message in $msg_in into $msg_out.
 #    Arguments: OBJ($curproc) OBJ($msg_in) OBJ($msg_out)
 # Side Effects: create a new $tmpfile
-#               update garbage collection queue (clean_up_queue)
+#               update garbage collection queue (cleanup_queue)
 # Return Value: none
 sub _append_rfc822_message
 {
@@ -2688,11 +2688,11 @@ sub _append_rfc822_message
 }
 
 
-# Descriptions: insert $file into garbage collection queue (clean_up_queue).
+# Descriptions: insert $file into garbage collection queue (cleanup_queue).
 #    Arguments: OBJ($curproc) STR($file)
 # Side Effects: update $curproc->{ __tmp_file_cleanup };
 # Return Value: none
-sub _add_into_clean_up_queue
+sub _add_into_cleanup_queue
 {
     my ($curproc, $file) = @_;
     my $queue = $curproc->{ __tmp_file_cleanup };
@@ -2706,7 +2706,7 @@ sub _add_into_clean_up_queue
 }
 
 
-# Descriptions: remove garbage collection queue (clean_up_queue).
+# Descriptions: remove garbage collection queue (cleanup_queue).
 #    Arguments: OBJ($curproc)
 # Side Effects: remove files in $curproc->{ __tmp_file_cleanup }
 # Return Value: none
@@ -2725,7 +2725,7 @@ sub tmp_file_cleanup
     # XXX ONLY WHEN VALID $ml_home_dir EXISTS.
     # clean up tmp_dir.
     if ($curproc->_is_valid_ml_home_dir()) {
-	my $channel = "clean_up_tmp_dir";
+	my $channel = "cleanup_tmp_dir";
 	if ($curproc->is_event_timeout($channel)) {
 	    my $config   = $curproc->config();
 	    my $tmp_dir  = $config->{ tmp_dir };
@@ -2744,7 +2744,7 @@ sub incoming_message_cleanup_queue
 {
     my ($curproc) = @_;
     my $config    = $curproc->config();
-    my $channel   = 'mail_incoming_queue_clean_up';
+    my $channel   = 'mail_incoming_queue_cleanup';
 
     # XXX ONLY WHEN VALID $ml_home_dir EXISTS.
     if ($curproc->_is_valid_ml_home_dir()) {
@@ -2764,7 +2764,7 @@ sub incoming_message_cleanup_queue
 		directory => $queue_dir,
 	    };
 	    $queue->set_log_function($fp);
-	    $queue->clean_up();
+	    $queue->cleanup();
 	    $curproc->event_set_timeout($channel, time + 24*3600);
 	}
     }
@@ -2807,14 +2807,14 @@ sub tmp_file_path
     if (-d $tmp_dir && -w $tmp_dir) {
 	use File::Spec;
 	my $_file = File::Spec->catfile($tmp_dir, $f);
-	$curproc->_add_into_clean_up_queue($_file);
+	$curproc->_add_into_cleanup_queue($_file);
 	return $_file;
     }
     else {
 	my $tmp_dir = $curproc->global_tmp_dir_path();
 	use File::Spec;
 	my $_file = File::Spec->catfile($tmp_dir, $f);
-	$curproc->_add_into_clean_up_queue($_file);
+	$curproc->_add_into_cleanup_queue($_file);
 	return $_file;
     }
 }
@@ -2918,7 +2918,7 @@ sub queue_flush
     my $config    = $curproc->config();
     my $queue_dir = $config->{ mail_queue_dir };
     my $qmgr_args = { directory => $queue_dir };
-    my $channel   = 'mail_queue_clean_up';
+    my $channel   = 'mail_queue_cleanup';
 
     # XXX-TODO: timeout should be customizable.
     eval q{
diff --git a/fml/lib/FML/Process/State.pm b/fml/lib/FML/Process/State.pm
index ccbc49a5..9963d50a 100644
--- a/fml/lib/FML/Process/State.pm
+++ b/fml/lib/FML/Process/State.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: State.pm,v 1.21 2005/06/04 08:49:11 fukachan Exp $
+# $FML: State.pm,v 1.22 2005/08/10 13:58:36 fukachan Exp $
 #
 
 package FML::Process::State;
@@ -221,7 +221,7 @@ sub command_context_init
     my ($curproc, $orig_command) = @_;
 
     # Example: if orig_command = "# help", comname = "help"
-    my $cleanstr = $curproc->_command_string_clean_up($orig_command);
+    my $cleanstr = $curproc->_command_string_cleanup($orig_command);
     my $context  = $curproc->_build_command_context_template($cleanstr);
 
     # save original string, set the command mode be "user" by default.
@@ -298,7 +298,7 @@ sub _build_command_context_template
 #    Arguments: OBJ($curproc) STR($buf)
 # Side Effects: none
 # Return Value: STR
-sub _command_string_clean_up
+sub _command_string_cleanup
 {
     my ($curproc, $buf) = @_;
     my $config          = $curproc->config();
diff --git a/fml/lib/Mail/Bounce.pm b/fml/lib/Mail/Bounce.pm
index eefbb6e8..f4e48804 100644
--- a/fml/lib/Mail/Bounce.pm
+++ b/fml/lib/Mail/Bounce.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: Bounce.pm,v 1.28 2004/06/30 03:05:15 fukachan Exp $
+# $FML: Bounce.pm,v 1.29 2005/05/26 13:13:25 fukachan Exp $
 #
 
 package Mail::Bounce;
@@ -282,7 +282,7 @@ sub look_like_japanese
 }
 
 
-=head2 address_clean_up(hint, addr)
+=head2 address_cleanup(hint, addr)
 
 clean up C<addr> and return it.
 
@@ -296,17 +296,17 @@ It is rarely used.
 #    Arguments: OBJ($self) STR($hint) STR($addr)
 # Side Effects: none
 # Return Value: STR
-sub address_clean_up
+sub address_cleanup
 {
     my ($self, $hint, $addr) = @_;
 
-    if ($debug) { print STDERR "address_clean_up($hint, $addr)\n";}
+    if ($debug) { print STDERR "address_cleanup($hint, $addr)\n";}
 
     # remove prepended and trailing strings around user@domain pattern.
     my $prev_addr = $addr;
     do {
 	$prev_addr = $addr;
-	print STDERR "    address_clean_up.in: $prev_addr\n" if $debug;
+	print STDERR "    address_cleanup.in: $prev_addr\n" if $debug;
 
 	$addr      =~ s/\.$//o;
 	$addr      =~ s/^\<//o;
@@ -314,7 +314,7 @@ sub address_clean_up
 	$addr      =~ s/^\"//o;
 	$addr      =~ s/\"$//o;
 
-	print STDERR "   address_clean_up.out: $addr\n" if $debug;
+	print STDERR "   address_cleanup.out: $addr\n" if $debug;
     } while ($addr ne $prev_addr);
 
     # Mail::Bounce::FixBrokenAddress class provides irrgular
diff --git a/fml/lib/Mail/Bounce/DSN.pm b/fml/lib/Mail/Bounce/DSN.pm
index 474444d7..ea3ace06 100644
--- a/fml/lib/Mail/Bounce/DSN.pm
+++ b/fml/lib/Mail/Bounce/DSN.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: DSN.pm,v 1.23 2004/01/24 09:00:54 fukachan Exp $
+# $FML: DSN.pm,v 1.24 2004/06/30 03:05:15 fukachan Exp $
 #
 
 
@@ -134,11 +134,11 @@ sub _parse_dsn_format
 	$header->get('Final-Recipient');
 
     if ($addr =~ /.*;\s*(\S+\@\S+\w+)/) { $addr = $1;}
-    $addr = $self->address_clean_up($self, $addr);
+    $addr = $self->address_cleanup($self, $addr);
 
     # gives $addr itself as a hint of fixing broken address
     # domain part of $addr may match someting e.g. nifty.ne.jp, webtv.ne.jp.
-    $addr = $self->address_clean_up($addr, $addr);
+    $addr = $self->address_cleanup($addr, $addr);
 
     if ($debug) {
 	print STDERR "\t *** valid address is not found\n" unless $addr;
diff --git a/fml/lib/Mail/Bounce/Exim.pm b/fml/lib/Mail/Bounce/Exim.pm
index ae3adabf..9e28c652 100644
--- a/fml/lib/Mail/Bounce/Exim.pm
+++ b/fml/lib/Mail/Bounce/Exim.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: Exim.pm,v 1.13 2004/06/30 03:05:16 fukachan Exp $
+# $FML: Exim.pm,v 1.14 2005/05/26 13:12:42 fukachan Exp $
 #
 
 
@@ -65,7 +65,7 @@ sub analyze
 
     # set up return buffer if $addr is found.
     if ($addr) {
-	$addr = $self->address_clean_up($addr, $addr);
+	$addr = $self->address_cleanup($addr, $addr);
 	$result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	$result->{ $addr }->{ 'Status' }          = '5.x.y';
 	$result->{ $addr }->{ 'hints' }           = 'exim';
diff --git a/fml/lib/Mail/Bounce/Freeserve.pm b/fml/lib/Mail/Bounce/Freeserve.pm
index 9ead91c3..bdae8da6 100644
--- a/fml/lib/Mail/Bounce/Freeserve.pm
+++ b/fml/lib/Mail/Bounce/Freeserve.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: Freeserve.pm,v 1.6 2004/07/10 00:42:00 fukachan Exp $
+# $FML: Freeserve.pm,v 1.7 2005/05/26 13:12:42 fukachan Exp $
 #
 
 #
@@ -67,7 +67,7 @@ sub analyze
 
 	# set up return buffer if $addr is found.
 	if ($addr) {
-	    $addr = $self->address_clean_up($addr, $addr);
+	    $addr = $self->address_cleanup($addr, $addr);
 	    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	    $result->{ $addr }->{ 'Status' }          = '4.x.y';
 	    $result->{ $addr }->{ 'hints' }           = 'freeserve.ne.jp';
diff --git a/fml/lib/Mail/Bounce/GOO.pm b/fml/lib/Mail/Bounce/GOO.pm
index 29df7af7..21944c4e 100644
--- a/fml/lib/Mail/Bounce/GOO.pm
+++ b/fml/lib/Mail/Bounce/GOO.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: GOO.pm,v 1.12 2004/06/30 03:05:16 fukachan Exp $
+# $FML: GOO.pm,v 1.13 2005/05/26 13:12:42 fukachan Exp $
 #
 
 
@@ -57,7 +57,7 @@ sub analyze
 
 	# set up return buffer if $addr is found.
 	if ($addr) {
-	    $addr = $self->address_clean_up($addr, $addr);
+	    $addr = $self->address_cleanup($addr, $addr);
 	    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	    $result->{ $addr }->{ 'Status' }          = '5.x.y';
 	    $result->{ $addr }->{ 'hints' }           = 'goo.ne.jp';
diff --git a/fml/lib/Mail/Bounce/Postfix19991231.pm b/fml/lib/Mail/Bounce/Postfix19991231.pm
index e7d7620a..ddb22188 100644
--- a/fml/lib/Mail/Bounce/Postfix19991231.pm
+++ b/fml/lib/Mail/Bounce/Postfix19991231.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: Postfix19991231.pm,v 1.23 2004/01/24 09:03:57 fukachan Exp $
+# $FML: Postfix19991231.pm,v 1.24 2004/06/30 03:05:16 fukachan Exp $
 #
 
 
@@ -153,7 +153,7 @@ sub _parse_address
 
     if ($data =~ /\<(\S+\@\S+\w+)\>:\s*(.*)/) {
 	my ($addr, $reason) = ($1, $2);
-	$addr = $self->address_clean_up($self, $addr);
+	$addr = $self->address_cleanup($self, $addr);
 	$result->{ $addr }->{ 'Diagnostic-Code' } = $reason;
 	$result->{ $addr }->{ 'Status' }          = '5.x.y';
 	$result->{ $addr }->{ 'hints' }           = 'postfix 19991231 style';
diff --git a/fml/lib/Mail/Bounce/Qmail.pm b/fml/lib/Mail/Bounce/Qmail.pm
index 7eb7ec21..0c06e337 100644
--- a/fml/lib/Mail/Bounce/Qmail.pm
+++ b/fml/lib/Mail/Bounce/Qmail.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: Qmail.pm,v 1.11 2004/06/30 03:05:16 fukachan Exp $
+# $FML: Qmail.pm,v 1.12 2005/05/26 13:12:42 fukachan Exp $
 #
 
 
@@ -61,7 +61,7 @@ sub analyze
 		    $data =~ s/\n/ /go;
 		    if ($data =~ /\<(\S+\@\S+)\>:\s*(.*)/) {
 			($addr, $reason) = ($1, $2);
-			$addr = $self->address_clean_up($addr, $addr);
+			$addr = $self->address_cleanup($addr, $addr);
 
 			my $status = '5.x.y';
 			if ($data =~ /\#(\d+\.\d+\.\d+)/) {
diff --git a/fml/lib/Mail/Bounce/SimpleMatch.pm b/fml/lib/Mail/Bounce/SimpleMatch.pm
index 13278130..74cc6e79 100644
--- a/fml/lib/Mail/Bounce/SimpleMatch.pm
+++ b/fml/lib/Mail/Bounce/SimpleMatch.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: SimpleMatch.pm,v 1.41 2004/06/02 12:00:00 tmu Exp $
+# $FML: SimpleMatch.pm,v 1.42 2004/06/30 03:05:16 fukachan Exp $
 #
 
 
@@ -306,7 +306,7 @@ sub _address_match
 
 	    if ($buf =~ /(\S+\@\S+\w+)/) {
 		if ($debug) { print STDERR "trap address ($1)\n";}
-		my $addr = $self->address_clean_up($mta_type, $1);
+		my $addr = $self->address_cleanup($mta_type, $1);
 		if ($addr) {
 		    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 		    $result->{ $addr }->{ 'Status'}           = '5.x.y';
@@ -315,7 +315,7 @@ sub _address_match
 	    }
 
 	    if ($addr_regexp && $buf =~ /$addr_regexp/) {
-		my $addr = $self->address_clean_up($mta_type, $1);
+		my $addr = $self->address_cleanup($mta_type, $1);
 		if ($addr) {
 		    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 		    $result->{ $addr }->{ 'Status'}           = '5.x.y';
diff --git a/fml/lib/Mail/Bounce/Smtpfeed.pm b/fml/lib/Mail/Bounce/Smtpfeed.pm
index 2af47222..c82b0312 100644
--- a/fml/lib/Mail/Bounce/Smtpfeed.pm
+++ b/fml/lib/Mail/Bounce/Smtpfeed.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: Smtpfeed.pm,v 1.10 2004/06/30 03:05:17 fukachan Exp $
+# $FML: Smtpfeed.pm,v 1.11 2005/05/26 13:12:42 fukachan Exp $
 #
 
 
@@ -58,7 +58,7 @@ sub analyze
 
 	# set up return buffer
 	if ($addr) {
-	    $addr = $self->address_clean_up($addr, $addr);
+	    $addr = $self->address_cleanup($addr, $addr);
 	    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	    $result->{ $addr }->{ 'Status' }          = '5.x.y';
 	    $result->{ $addr }->{ 'hints' }           = 'smtpfeed';
diff --git a/fml/lib/Mail/Delivery/Queue.pm b/fml/lib/Mail/Delivery/Queue.pm
index 1bfde914..97ecfd0c 100644
--- a/fml/lib/Mail/Delivery/Queue.pm
+++ b/fml/lib/Mail/Delivery/Queue.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: Queue.pm,v 1.52 2005/06/03 12:52:02 fukachan Exp $
+# $FML: Queue.pm,v 1.53 2005/08/09 03:23:31 fukachan Exp $
 #
 
 package Mail::Delivery::Queue;
@@ -120,7 +120,7 @@ sub new
     my $qf_new = $me->new_file_path($id);
     my $files  = [];
     push(@$files, $qf_new);
-    $me->{ _clean_up_files } = $files;
+    $me->{ _cleanup_files } = $files;
     
 
     return bless $me, $type;
@@ -1064,7 +1064,7 @@ sub is_valid_queue
 sub DESTROY
 {
     my ($self) = @_;
-    my $files  = $self->{ _clean_up_files } || [];
+    my $files  = $self->{ _cleanup_files } || [];
 
     for my $file (@$files) {
 	unlink $file if -f $file;
@@ -1516,7 +1516,7 @@ sub set_log_function
 
 =head1 CLEAN UP GARBAGES
 
-=head2 clean_up()
+=head2 cleanup()
 
 remove too old incoming queue files.
 
@@ -1527,7 +1527,7 @@ remove too old incoming queue files.
 #    Arguments: OBJ($self)
 # Side Effects: remove too old incoming queue files.
 # Return Value: none
-sub clean_up
+sub cleanup
 {
     my ($self) = @_;
     my $dir    = $self->{ _directory } || croak("directory undefined");
diff --git a/fml/lib/Mail/Message/Address.pm b/fml/lib/Mail/Message/Address.pm
index ab58c27c..b1d259a2 100644
--- a/fml/lib/Mail/Message/Address.pm
+++ b/fml/lib/Mail/Message/Address.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: Address.pm,v 1.5 2004/07/06 23:55:58 fukachan Exp $
+# $FML: Address.pm,v 1.6 2004/07/23 13:16:44 fukachan Exp $
 #
 
 package Mail::Message::Address;
@@ -75,7 +75,7 @@ sub as_str
 
 =head1 CLEAN UP
 
-=head2 clean_up()
+=head2 cleanup()
 
 clean up address. no return value.
 
@@ -86,7 +86,7 @@ clean up address. no return value.
 #    Arguments: OBJ($self)
 # Side Effects: update $self->{ _string }.
 # Return Value: none
-sub clean_up
+sub cleanup
 {
     my ($self) = @_;
     my $addr   = $self->{ _string } || '';
diff --git a/fml/lib/Mail/Message/DB.pm b/fml/lib/Mail/Message/DB.pm
index e5a77532..48ad11f0 100644
--- a/fml/lib/Mail/Message/DB.pm
+++ b/fml/lib/Mail/Message/DB.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: DB.pm,v 1.22 2005/08/06 10:06:00 fukachan Exp $
+# $FML: DB.pm,v 1.23 2005/08/19 11:15:23 fukachan Exp $
 #
 
 package Mail::Message::DB;
@@ -21,7 +21,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD
 use Carp;
 use File::Spec;
 
-my $version = q$FML: DB.pm,v 1.22 2005/08/06 10:06:00 fukachan Exp $;
+my $version = q$FML: DB.pm,v 1.23 2005/08/19 11:15:23 fukachan Exp $;
 if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = $1;}
 
 # special value
@@ -331,7 +331,7 @@ sub _save_header_info
 
 	# ADDR type: save the first element of address list.
 	if ($header_field_type{ $key } =~ /ADDR/o) { # ADDR or ADDR_LIST
-	    my $ra_val = $self->_address_clean_up( $val );
+	    my $ra_val = $self->_address_cleanup( $val );
 	    $val = $ra_val->[0] || '';
 	    $self->_db_set($db, $key, $id, $val);
 	}
@@ -376,8 +376,8 @@ sub _analyze_thread
 {
     my ($self, $db, $id, $msg, $hdr) = @_;
     my $current_key  = $self->get_key();
-    my $ra_ref       = $self->_address_clean_up($hdr->get('references'));
-    my $ra_inreplyto = $self->_address_clean_up($hdr->get('in-reply-to'));
+    my $ra_ref       = $self->_address_cleanup($hdr->get('references'));
+    my $ra_inreplyto = $self->_address_cleanup($hdr->get('in-reply-to'));
     my $in_reply_to  = $ra_inreplyto->[0] || '';
     my %uniq         = ();
     my $count        = 0;
@@ -912,7 +912,7 @@ sub _decode_mime_string
 #    Arguments: OBJ($self) STR($addr)
 # Side Effects: none
 # Return Value: ARRAY_REF
-sub _address_clean_up
+sub _address_cleanup
 {
     my ($self, $addr) = @_;
     my (@r);