You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/11/13 04:42:11 UTC
svn commit: rev 57557 - in spamassassin/trunk/lib/Mail/SpamAssassin: . BayesStore Conf Locker Message Message/Metadata Plugin
Author: felicity
Date: Fri Nov 12 19:42:10 2004
New Revision: 57557
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Win32.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm
spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm
spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Log:
remove the various dbg() functions in almost all of the modules and just use a typeglob to point at the main dbg() that they all call. this removes the extra overhead of having excess functions and function calls for dbg() which is called a bajillion times. also, make the plugins use the documented M::SA::Plugin::dbg(), which is also a typeglob so the plugins point the same place for now...
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm Fri Nov 12 19:42:10 2004
@@ -40,6 +40,9 @@
package Mail::SpamAssassin::AutoWhitelist;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -239,7 +242,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm Fri Nov 12 19:42:10 2004
@@ -47,6 +47,9 @@
package Mail::SpamAssassin::Bayes;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -1376,7 +1379,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm Fri Nov 12 19:42:10 2004
@@ -29,6 +29,9 @@
package Mail::SpamAssassin::BayesStore;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -854,7 +857,6 @@
}
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Fri Nov 12 19:42:10 2004
@@ -16,6 +16,9 @@
package Mail::SpamAssassin::BayesStore::DBM;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -1810,7 +1813,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm Fri Nov 12 19:42:10 2004
@@ -28,6 +28,9 @@
package Mail::SpamAssassin::BayesStore::SQL;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -2094,7 +2097,6 @@
return $num_lowfreq;
}
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Fri Nov 12 19:42:10 2004
@@ -70,6 +70,9 @@
use Mail::SpamAssassin::Conf::Parser;
use File::Spec;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -3561,7 +3564,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm Fri Nov 12 19:42:10 2004
@@ -24,6 +24,9 @@
package Mail::SpamAssassin::Conf::LDAP;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -165,7 +168,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Fri Nov 12 19:42:10 2004
@@ -118,6 +118,10 @@
=cut
package Mail::SpamAssassin::Conf::Parser;
+
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use Mail::SpamAssassin::Conf;
use Mail::SpamAssassin::Constants qw(:sa);
@@ -845,7 +849,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm Fri Nov 12 19:42:10 2004
@@ -40,6 +40,9 @@
package Mail::SpamAssassin::Conf::SQL;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -166,7 +169,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm Fri Nov 12 19:42:10 2004
@@ -16,6 +16,9 @@
package Mail::SpamAssassin::DBBasedAddrList;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -174,7 +177,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm Fri Nov 12 19:42:10 2004
@@ -16,6 +16,9 @@
package Mail::SpamAssassin::Locker::Flock;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -157,7 +160,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm Fri Nov 12 19:42:10 2004
@@ -16,6 +16,9 @@
package Mail::SpamAssassin::Locker::UnixNFSSafe;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -218,7 +221,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Win32.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Win32.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Win32.pm Fri Nov 12 19:42:10 2004
@@ -16,6 +16,9 @@
package Mail::SpamAssassin::Locker::Win32;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -105,8 +108,5 @@
}
###########################################################################
-
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Fri Nov 12 19:42:10 2004
@@ -42,6 +42,10 @@
# +---> Message::Metadata object to hold metadata
package Mail::SpamAssassin::Message;
+
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -941,7 +945,5 @@
}
# ---------------------------------------------------------------------------
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm Fri Nov 12 19:42:10 2004
@@ -48,6 +48,10 @@
=cut
package Mail::SpamAssassin::Message::Metadata;
+
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -145,7 +149,5 @@
}
# ---------------------------------------------------------------------------
-
-#sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Fri Nov 12 19:42:10 2004
@@ -1154,8 +1154,6 @@
$self->{relays} = [ ];
}
-sub dbg { Mail::SpamAssassin::dbg(@_); }
-
# ---------------------------------------------------------------------------
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm Fri Nov 12 19:42:10 2004
@@ -34,6 +34,10 @@
=cut
package Mail::SpamAssassin::Message::Node;
+
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -640,8 +644,6 @@
}
# ---------------------------------------------------------------------------
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
__END__
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Fri Nov 12 19:42:10 2004
@@ -17,6 +17,9 @@
package Mail::SpamAssassin::NetSet;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -100,10 +103,6 @@
}
0;
}
-
-###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm Fri Nov 12 19:42:10 2004
@@ -45,6 +45,9 @@
package Mail::SpamAssassin::PerMsgLearner;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -181,10 +184,6 @@
delete $self->{conf};
delete $self->{bayes_scanner};
}
-
-###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Fri Nov 12 19:42:10 2004
@@ -46,6 +46,9 @@
package Mail::SpamAssassin::PerMsgStatus;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -2567,7 +2570,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub sa_die { Mail::SpamAssassin::sa_die(@_); }
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm Fri Nov 12 19:42:10 2004
@@ -93,6 +93,10 @@
=cut
package Mail::SpamAssassin::Plugin;
+
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use Mail::SpamAssassin;
use strict;
@@ -558,8 +562,6 @@
C<Mail::SpamAssassin::Plugin::dbg($msg)>.
=cut
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm Fri Nov 12 19:42:10 2004
@@ -74,6 +74,9 @@
package Mail::SpamAssassin::Plugin::Hashcash;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::Plugin::dbg;
+
use Mail::SpamAssassin::Plugin;
use Digest::SHA1 qw(sha1);
use Fcntl;
@@ -317,7 +320,5 @@
}
############################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm Fri Nov 12 19:42:10 2004
@@ -28,6 +28,9 @@
package Mail::SpamAssassin::Plugin::Razor2;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::Plugin::dbg;
+
use Mail::SpamAssassin::Plugin;
use strict;
use warnings;
@@ -402,7 +405,5 @@
return;
}
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Fri Nov 12 19:42:10 2004
@@ -14,6 +14,9 @@
package Mail::SpamAssassin::Plugin::RelayCountry;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::Plugin::dbg;
+
use Mail::SpamAssassin::Plugin;
use strict;
use warnings;
@@ -64,7 +67,5 @@
return 1;
}
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Fri Nov 12 19:42:10 2004
@@ -25,6 +25,9 @@
package Mail::SpamAssassin::Plugin::SPF;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::Plugin::dbg;
+
use Mail::SpamAssassin::Plugin;
use strict;
use warnings;
@@ -264,7 +267,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Fri Nov 12 19:42:10 2004
@@ -88,6 +88,9 @@
package Mail::SpamAssassin::Plugin::URIDNSBL;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::Plugin::dbg;
+
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Util;
use strict;
@@ -676,13 +679,9 @@
# ---------------------------------------------------------------------------
sub log_dns_result {
- my $self = shift;
+ #my $self = shift;
#Mail::SpamAssassin::dbg("uridnsbl: ".join (' ', @_));
}
-
-# ---------------------------------------------------------------------------
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
# ---------------------------------------------------------------------------
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PluginHandler.pm Fri Nov 12 19:42:10 2004
@@ -21,6 +21,10 @@
=cut
package Mail::SpamAssassin::PluginHandler;
+
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use Mail::SpamAssassin;
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Util;
@@ -191,7 +195,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm Fri Nov 12 19:42:10 2004
@@ -18,6 +18,9 @@
package Mail::SpamAssassin::Reporter;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -357,7 +360,6 @@
###########################################################################
-sub dbg { Mail::SpamAssassin::dbg(@_); }
sub create_fulltext_tmpfile { Mail::SpamAssassin::PerMsgStatus::create_fulltext_tmpfile(@_) }
sub delete_fulltext_tmpfile { Mail::SpamAssassin::PerMsgStatus::delete_fulltext_tmpfile(@_) }
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm Fri Nov 12 19:42:10 2004
@@ -69,6 +69,9 @@
package Mail::SpamAssassin::SQLBasedAddrList;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -354,7 +357,5 @@
return ($email, $ip);
}
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm Fri Nov 12 19:42:10 2004
@@ -16,6 +16,9 @@
package Mail::SpamAssassin::TextCat;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -155,7 +158,5 @@
return @sorted;
}
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Fri Nov 12 19:42:10 2004
@@ -20,6 +20,9 @@
package Mail::SpamAssassin::Util;
+# Make the main dbg() accessible in our package w/o an extra function
+*dbg=\&Mail::SpamAssassin::dbg;
+
use strict;
use warnings;
use bytes;
@@ -1105,7 +1108,5 @@
}
###########################################################################
-
-sub dbg { Mail::SpamAssassin::dbg(@_); }
1;