FNF: XXX_clean_up() -> XXX_cleanup()

12 files changed, 38 insertions, 38 deletions

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);