Mailing List Archive

Author: mss
Date: Thu Dec 2 15:14:24 2004
New Revision: 109582

URL: http://svn.apache.org/viewcvs?view=rev&rev=109582
Log:
Code duplication baaaad.

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin.pm?view=diff&rev=109582&p1=spamassassin/trunk/lib/Mail/SpamAssassin.pm&r1=109581&p2=spamassassin/trunk/lib/Mail/SpamAssassin.pm&r2=109582
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Thu Dec 2 15:14:24 2004
@@ -1626,26 +1626,30 @@
return @addrs;
}

-# usage: dbg("facility: message")
-# This is used for all low priority debugging messages.
-sub dbg {
- return unless $Mail::SpamAssassin::DEBUG;
+###########################################################################

- my $facility = "generic";
- my $message = shift;
+sub _dbg_info_helper {
+ my($facility, $prefix, $message) = ("generic", @_);

if ($message =~ /^(\S+?):\s*(.*)/s) {
$facility = $1;
$message = $2;
}

- if ($facilities{all} || $facilities{$facility}) {
+ if ($facilities{all} || $facilities{$prefix} || $facilities{$facility}) {
$message =~ s/\n+$//s;
- $message =~ s/^/debug: ${facility}:\t/mg;
+ $message =~ s/^/${prefix}: ${facility}:\t/mg;
warn "$message\n";
}
}

+# usage: dbg("facility: message")
+# This is used for all low priority debugging messages.
+sub dbg {
+ return unless $Mail::SpamAssassin::DEBUG;
+ _dbg_info_helper("debug", @_);
+}
+
# returns whether or not debugging is enabled in general or (if specified) for
# a certain facility
sub dbg_check {
@@ -1671,18 +1675,7 @@
# significant, condition. This should be very infrequently called.
sub info {
return unless $Mail::SpamAssassin::INFO;
-
- my $facility = "generic";
- my $message = shift;
-
- if ($message =~ /^(\S+?):\s*(.*)/) {
- $facility = $1;
- $message = $2;
- }
-
- if ($facilities{all} || $facilities{info} || $facilities{$facility}) {
- warn "info: $facility: $message\n";
- }
+ _dbg_info_helper("info", @_);
}

# returns whether or not info output is enabled in general or (if specified) for
@@ -1717,6 +1710,8 @@
warn @_;
exit $exitcode;
}
+
+###########################################################################

# private function to find out if the Storable function is available...
sub _is_storable_available {