Mailing List Archive

Author: duncf
Date: Sat Aug 27 18:19:23 2005
New Revision: 261912

URL: http://svn.apache.org/viewcvs?rev=261912&view=rev
Log:
Bug 4552: Fix unitialized value warnings in spamd with TELLs

Modified:
spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamd/spamd.raw?rev=261912&r1=261911&r2=261912&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Sat Aug 27 18:19:23 2005
@@ -1475,18 +1475,21 @@
push(@did_remove, 'remote') if ($msgrpt->revoke());
}

- my $hdr;
- my $info_set_str;
- my $info_remove_str;
+ my $hdr = "";
+ my $info_str;

if (scalar(@did_set)) {
$hdr .= "DidSet: " . join(',', @did_set) . "\r\n";
- $info_set_str = " Setting " . join(',', @did_set) . " ";
+ $info_str .= " Setting " . join(',', @did_set) . " ";
}

if (scalar(@did_remove)) {
$hdr .= "DidRemove: " . join(',', @did_remove) . "\r\n";
- $info_remove_str = " Removing " . join(',', @did_remove) . " ";
+ $info_str .= " Removing " . join(',', @did_remove) . " ";
+ }
+
+ if (!$info_str) {
+ $info_str = " Did nothing ";
}

print $client "SPAMD/1.1 $resphash{$resp} $resp\r\n",
@@ -1494,7 +1497,7 @@

my $scantime = sprintf( "%.1f", time - $start_time );

- info("spamd:$info_set_str$info_remove_str for $current_user:$> in"
+ info("spamd: Tell:${info_str}for $current_user:$> in"
. " $scantime seconds, $actual_length bytes");

$mail->finish();