You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/07/27 01:34:57 UTC
svn commit: r1151293 - in /spamassassin/trunk: lib/Mail/
lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/BayesStore/
lib/Mail/SpamAssassin/Conf/ lib/Mail/SpamAssassin/Message/
lib/Mail/SpamAssassin/Plugin/ lib/Mail/SpamAssassin/Util/ spamd/ xt/
Author: mmartinec
Date: Tue Jul 26 23:34:52 2011
New Revision: 1151293
URL: http://svn.apache.org/viewvc?rev=1151293&view=rev
Log:
fix Test::Perl::Critic Subroutines::ProhibitExplicitReturnUndef warnings emitted by 60_perlcritic.t - replacing "return undef" with "return" prevents accidental subroutine call in a list context from treating a failure as a true
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin.pm
spamassassin/trunk/lib/Mail/SpamAssassin/AICache.pm
spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm
spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util/Progress.pm
spamassassin/trunk/spamd/spamd.raw
spamassassin/trunk/xt/60_perlcritic.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Tue Jul 26 23:34:52 2011
@@ -1990,7 +1990,7 @@ sub expand_name ($) {
sub sed_path {
my ($self, $path) = @_;
- return undef if (!defined $path);
+ return if !defined $path;
if (exists($self->{conf}->{sed_path_cache}->{$path})) {
return $self->{conf}->{sed_path_cache}->{$path};
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AICache.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AICache.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AICache.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AICache.pm Tue Jul 26 23:34:52 2011
@@ -157,7 +157,7 @@ sub update {
sub finish {
my ($self) = @_;
- return undef unless $self->{dirty};
+ return unless $self->{dirty};
# Cache is dirty, so write out new file
@@ -193,7 +193,7 @@ sub finish {
}
}
- return undef;
+ return;
}
sub canon {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm Tue Jul 26 23:34:52 2011
@@ -123,7 +123,7 @@ sub check_address {
my ($self, $addr, $origip, $signedby) = @_;
if (!defined $self->{checker}) {
- return undef; # no factory defined; we can't check
+ return; # no factory defined; we can't check
}
$self->{entry} = undef;
@@ -192,11 +192,11 @@ sub add_score {
my ($self,$score) = @_;
if (!defined $self->{checker}) {
- return undef; # no factory defined; we can't check
+ return; # no factory defined; we can't check
}
if ($score != $score) {
warn "auto-whitelist: attempt to add a $score to AWL entry ignored\n";
- return undef; # don't try to add a NaN
+ return; # don't try to add a NaN
}
$self->{entry}->{count} ||= 0;
@@ -248,7 +248,7 @@ sub modify_address {
my ($self, $addr, $score, $signedby) = @_;
if (!defined $self->{checker}) {
- return undef; # no factory defined; we can't check
+ return; # no factory defined; we can't check
}
my $fulladdr = $self->pack_addr ($addr, undef);
@@ -275,7 +275,7 @@ sub modify_address {
sub finish {
my $self = shift;
- if (!defined $self->{checker}) { return undef; }
+ return if !defined $self->{checker};
$self->{checker}->finish();
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm Tue Jul 26 23:34:52 2011
@@ -305,7 +305,7 @@ sub untie_db {
}
}
- return undef;
+ return;
}
sub _close_db {
@@ -327,7 +327,7 @@ sub _close_db {
}
delete $self->{env};
- return undef;
+ return;
}
=head2 calculate_expire_delta
@@ -1547,7 +1547,7 @@ sub _get {
if ($status == 0) {
return $value;
} elsif ($status == DB_NOTFOUND) {
- return undef;
+ return;
} else {
die "Couldn't get record: $BerkeleyDB::Error";
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Tue Jul 26 23:34:52 2011
@@ -1005,7 +1005,7 @@ sub set_last_expire {
sub get_running_expire_tok {
my ($self) = @_;
my $running = $self->{db_toks}->{$RUNNING_EXPIRE_MAGIC_TOKEN};
- if (!$running || $running =~ /\D/) { return undef; }
+ if (!$running || $running =~ /\D/) { return; }
return $running;
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm Tue Jul 26 23:34:52 2011
@@ -303,7 +303,7 @@ sub set_running_expire_tok {
unless (defined($rows)) {
dbg("bayes: set_running_expire_tok: SQL error: ".$self->{_dbh}->errstr());
$self->{_dbh}->rollback();
- return undef;
+ return;
}
$self->{_dbh}->commit();
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm Tue Jul 26 23:34:52 2011
@@ -305,7 +305,7 @@ sub set_running_expire_tok {
unless (defined($rows)) {
dbg("bayes: set_running_expire_tok: SQL error: ".$self->{_dbh}->errstr());
$self->{_dbh}->rollback();
- return undef;
+ return;
}
$self->{_dbh}->commit();
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm Tue Jul 26 23:34:52 2011
@@ -76,7 +76,7 @@ sub new {
if (!$self->{bayes}->{conf}->{bayes_sql_dsn}) {
dbg("bayes: invalid config, must set bayes_sql_dsn config variable\n");
- return undef;
+ return;
}
$self->{_dsn} = $self->{bayes}->{conf}->{bayes_sql_dsn};
@@ -262,7 +262,7 @@ sub calculate_expire_delta {
unless ($rc) {
dbg("bayes: calculate_expire_delta: SQL error: ".$self->{_dbh}->errstr());
- return undef;
+ return;
}
my ($count) = $sth->fetchrow_array();
@@ -439,7 +439,7 @@ found.
sub seen_get {
my ($self, $msgid) = @_;
- return undef unless (defined($self->{_dbh}));
+ return unless defined($self->{_dbh});
my $sql = "SELECT flag FROM bayes_seen
WHERE id = ?
@@ -449,14 +449,14 @@ sub seen_get {
unless (defined($sth)) {
dbg("bayes: seen_get: SQL Error: ".$self->{_dbh}->errstr());
- return undef;
+ return;
}
my $rc = $sth->execute($self->{_userid}, $msgid);
unless ($rc) {
dbg("bayes: seen_get: SQL error: ".$self->{_dbh}->errstr());
- return undef;
+ return;
}
my ($flag) = $sth->fetchrow_array();
@@ -765,7 +765,7 @@ sub set_running_expire_tok {
$self->{_userid}, $time);
unless (defined($rows)) {
dbg("bayes: set_running_expire_tok: SQL error: ".$self->{_dbh}->errstr());
- return undef;
+ return;
}
return $time;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm Tue Jul 26 23:34:52 2011
@@ -195,7 +195,7 @@ sub learn {
my $remote = $self->_create_connection();
- return undef unless ($remote);
+ return unless $remote;
my $msgsize = length($msg.$EOL);
@@ -217,7 +217,7 @@ sub learn {
else { # bad learntype
$self->{resp_code} = 00;
$self->{resp_msg} = 'do not know';
- return undef;
+ return;
}
print $remote "$EOL";
@@ -229,14 +229,14 @@ sub learn {
defined $line || $!==0 or
$!==EBADF ? dbg("error reading from spamd (1): $!")
: die "error reading from spamd (1): $!";
- return undef unless (defined $line);
+ return unless defined $line;
my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
$self->{resp_code} = $resp_code;
$self->{resp_msg} = $resp_msg;
- return undef unless ($resp_code == 0);
+ return unless $resp_code == 0;
my $did_set = '';
my $did_remove = '';
@@ -282,7 +282,7 @@ sub report {
my $remote = $self->_create_connection();
- return undef unless ($remote);
+ return unless $remote;
my $msgsize = length($msg.$EOL);
@@ -299,14 +299,14 @@ sub report {
defined $line || $!==0 or
$!==EBADF ? dbg("error reading from spamd (3): $!")
: die "error reading from spamd (3): $!";
- return undef unless (defined $line);
+ return unless defined $line;
my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
$self->{resp_code} = $resp_code;
$self->{resp_msg} = $resp_msg;
- return undef unless ($resp_code == 0);
+ return unless $resp_code == 0;
my $reported_p = 0;
@@ -343,7 +343,7 @@ sub revoke {
my $remote = $self->_create_connection();
- return undef unless ($remote);
+ return unless $remote;
my $msgsize = length($msg.$EOL);
@@ -361,14 +361,14 @@ sub revoke {
defined $line || $!==0 or
$!==EBADF ? dbg("error reading from spamd (5): $!")
: die "error reading from spamd (5): $!";
- return undef unless (defined $line);
+ return unless defined $line;
my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
$self->{resp_code} = $resp_code;
$self->{resp_msg} = $resp_msg;
- return undef unless ($resp_code == 0);
+ return unless $resp_code == 0;
my $revoked_p = 0;
@@ -415,7 +415,7 @@ sub ping {
$!==EBADF ? dbg("error reading from spamd (7): $!")
: die "error reading from spamd (7): $!";
close $remote or die "error closing socket: $!";
- return undef unless (defined $line);
+ return unless defined $line;
my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
return 0 unless ($resp_msg eq 'PONG');
@@ -458,7 +458,7 @@ sub _create_connection {
unless ($remote) {
print "Failed to create connection to spamd daemon: $!\n";
- return undef;
+ return;
}
$remote;
@@ -548,14 +548,14 @@ sub _filter {
defined $line || $!==0 or
$!==EBADF ? dbg("error reading from spamd (8): $!")
: die "error reading from spamd (8): $!";
- return undef unless (defined $line);
+ return unless defined $line;
my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
$self->{resp_code} = $resp_code;
$self->{resp_msg} = $resp_msg;
- return undef unless ($resp_code == 0);
+ return unless $resp_code == 0;
for ($!=0; defined($line=<$remote>); $!=0) {
local($1,$2,$3);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Tue Jul 26 23:34:52 2011
@@ -1122,7 +1122,7 @@ Unicode. Requires the Encode::Detect mo
unless (defined $value && $value !~ /^$/) {
return $MISSING_REQUIRED_VALUE;
}
- return undef if $value == 0;
+ return if $value == 0;
return $INVALID_VALUE unless $value == 1;
unless ($] > 5.008004) {
@@ -4011,7 +4011,7 @@ sub get_rule_value {
return $self->{$test_type}->{$pri}->{$rulename};
}
}
- return undef; # if we get here we didn't find the rule
+ return; # if we get here we didn't find the rule
}
}
@@ -4032,7 +4032,7 @@ sub delete_rule {
return delete($self->{$test_type}->{$pri}->{$rulename});
}
}
- return undef; # if we get here we didn't find the rule
+ return; # if we get here we didn't find the rule
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Tue Jul 26 23:34:52 2011
@@ -572,7 +572,7 @@ sub cond_clause_can_or_has {
$self->lint_warn("bad 'if' line, cannot find '::' in $fn_name($method), ".
"in \"$self->{currentfile}\"", undef);
}
- return undef;
+ return;
}
# Let's do some linting here ...
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Tue Jul 26 23:34:52 2011
@@ -475,7 +475,7 @@ sub lookup_ns {
} or do {
my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
dbg("dns: NS lookup failed horribly, perhaps bad resolv.conf setting? (%s)", $eval_stat);
- return undef;
+ return;
};
}
@@ -509,7 +509,7 @@ sub lookup_mx {
} or do {
my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
dbg("dns: MX lookup failed horribly, perhaps bad resolv.conf setting? (%s)", $eval_stat);
- return undef;
+ return;
};
}
@@ -521,7 +521,7 @@ sub lookup_mx_exists {
my $ret = 0;
my $recs = $self->lookup_mx ($dom);
- if (!defined $recs) { return undef; }
+ if (!defined $recs) { return; }
if (scalar @{$recs}) { $ret = 1; }
dbg("dns: MX for '$dom' exists? $ret");
@@ -531,17 +531,17 @@ sub lookup_mx_exists {
sub lookup_ptr {
my ($self, $dom) = @_;
- return undef unless $self->load_resolver();
+ return unless $self->load_resolver();
if ($self->{main}->{local_tests_only}) {
dbg("dns: local tests only, not looking up PTR");
- return undef;
+ return;
}
my $IP_PRIVATE = IP_PRIVATE;
if ($dom =~ /${IP_PRIVATE}/) {
dbg("dns: IP is private, not looking up PTR: $dom");
- return undef;
+ return;
}
return if ($self->server_failed_to_respond_for_domain ($dom));
@@ -567,7 +567,7 @@ sub lookup_ptr {
} or do {
my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
dbg("dns: PTR lookup failed horribly, perhaps bad resolv.conf setting? (%s)", $eval_stat);
- return undef;
+ return;
};
}
dbg("dns: PTR for '$dom': '$name'");
@@ -579,10 +579,10 @@ sub lookup_ptr {
sub lookup_a {
my ($self, $name) = @_;
- return undef unless $self->load_resolver();
+ return unless $self->load_resolver();
if ($self->{main}->{local_tests_only}) {
dbg("dns: local tests only, not looking up A records");
- return undef;
+ return;
}
return if ($self->server_failed_to_respond_for_domain ($name));
@@ -609,7 +609,7 @@ sub lookup_a {
} or do {
my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
dbg("dns: A lookup failed horribly, perhaps bad resolv.conf setting? (%s)", $eval_stat);
- return undef;
+ return;
};
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm Tue Jul 26 23:34:52 2011
@@ -299,9 +299,7 @@ sub decode {
if ( !exists $self->{'decoded'} ) {
# Someone is looking for a decoded part where there is no raw data
# (multipart or subparsed message, etc.) Just return undef.
- if (!exists $self->{'raw'}) {
- return undef;
- }
+ return if !exists $self->{'raw'};
my $raw;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Tue Jul 26 23:34:52 2011
@@ -171,7 +171,7 @@ sub _convert_ipv4_cidr_to_ipv6 {
my ($self, $cidr) = @_;
# only do this for IPv4 addresses
- return undef unless ($cidr =~ /^\d+[.\/]/);
+ return unless $cidr =~ /^\d+[.\/]/;
if ($cidr !~ /\//) { # no mask
return NetAddr::IP->new6("::ffff:".$cidr);
@@ -186,7 +186,7 @@ sub _convert_ipv4_cidr_to_ipv6 {
# now, move that from 0:0:0:0:0:0: space to 0:0:0:0:0:ffff: space
if (!defined $ip6 || $ip6 !~ /^0:0:0:0:0:0:(.*)$/) {
warn "oops! unparseable IPv6 address for $cidr: $ip6";
- return undef;
+ return;
}
return NetAddr::IP->new6("::ffff:$1");
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Tue Jul 26 23:34:52 2011
@@ -263,7 +263,7 @@ sub parse_and_canonicalize_subtest {
# a comma-separated list of rcode names or their decimal values
my @rcodes = split(/\s*,\s*/, uc $1);
for (@rcodes) { $_ = $rcode_value{$_} if exists $rcode_value{$_} }
- return undef if grep(!/^\d+\z/, @rcodes);
+ return if grep(!/^\d+\z/, @rcodes);
# a hashref indicates a list of DNS rcodes (stored as hash keys)
$result = { map( ($_,1), @rcodes) };
} elsif ($subtest =~ m{^ ([^/-]+) (?: ([/-]) (.+) )? \z}xs) {
@@ -280,7 +280,7 @@ sub parse_and_canonicalize_subtest {
$_ = Mail::SpamAssassin::Util::my_inet_aton($_); # quad-dot -> number
$any_quad_dot = 1;
} else {
- return undef;
+ return;
}
}
$result = defined $n2 ? $n1.$delim.$n2
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm Tue Jul 26 23:34:52 2011
@@ -454,11 +454,11 @@ sub body_charset_is_likely_to_fp {
sub get_charset_from_ct_line {
my $type = shift;
- if (!defined $type) { return undef; }
+ if (!defined $type) { return; }
if ($type =~ /charset="([^"]+)"/i) { return $1; }
if ($type =~ /charset='([^']+)'/i) { return $1; }
if ($type =~ /charset=(\S+)/i) { return $1; }
- return undef;
+ return;
}
# came up on the users@ list, look for multipart/alternative parts which
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Jul 26 23:34:52 2011
@@ -529,7 +529,7 @@ sub parse_and_canonicalize_subtest {
$_ = Mail::SpamAssassin::Util::my_inet_aton($_); # quad-dot -> number
$any_quad_dot = 1;
} else {
- return undef;
+ return;
}
}
$digested_subtest = defined $n2 ? $n1.$delim.$n2
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm Tue Jul 26 23:34:52 2011
@@ -126,7 +126,7 @@ sub new_checker {
if (!$main->{conf}->{user_awl_dsn} ||
!$main->{conf}->{user_awl_sql_table}) {
dbg("auto-whitelist: sql-based invalid config");
- return undef;
+ return;
}
my $dsn = $main->{conf}->{user_awl_dsn};
@@ -138,7 +138,7 @@ sub new_checker {
if(!$dbh) {
info("auto-whitelist: sql-based unable to connect to database (%s) : %s",
$dsn, DBI::errstr);
- return undef;
+ return;
}
dbg("auto-whitelist: sql-based connected to $dsn");
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm Tue Jul 26 23:34:52 2011
@@ -515,7 +515,7 @@ sub order_idle_child_to_accept {
}
else {
dbg("prefork: no spare children to accept, waiting for one to complete");
- return undef;
+ return;
}
}
@@ -529,7 +529,7 @@ sub wait_for_child_to_accept {
return 1; # 1 == success
}
if ($state == PFSTATE_ERROR) {
- return undef;
+ return;
}
else {
warn "prefork: ordered child $kid to accept, but they reported state '$state', killing rogue";
@@ -537,7 +537,7 @@ sub wait_for_child_to_accept {
$self->adapt_num_children();
sleep 1;
- return undef;
+ return;
}
}
}
@@ -635,7 +635,7 @@ retry_read:
|| (exists &Errno::EWOULDBLOCK && $! == &Errno::EWOULDBLOCK))
{
# an error that wasn't non-blocking I/O-related. that's serious
- return undef;
+ return;
}
# ok, we didn't get it first time. we'll have to start using
@@ -652,7 +652,7 @@ retry_read:
elsif ($now > $deadline) {
# timed out! report failure
warn "prefork: sysread(".$sock->fileno.") failed after $timeout secs";
- return undef;
+ return;
}
else {
$tout = $deadline - $now; # the remaining timeout
@@ -703,7 +703,7 @@ retry_write:
warn "prefork: syswrite(".$sock->fileno.") to $targetname failed on try $try";
if ($try > $numretries) {
warn "prefork: giving up";
- return undef;
+ return;
}
else {
# give it 1 second to recover
@@ -729,7 +729,7 @@ retry_write:
|| (exists &Errno::EWOULDBLOCK && $! == &Errno::EWOULDBLOCK))
{
# an error that wasn't non-blocking I/O-related. that's serious
- return undef;
+ return;
}
warn "prefork: retrying syswrite(): $!";
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Tue Jul 26 23:34:52 2011
@@ -108,7 +108,7 @@ use constant RUNNING_ON_WINDOWS => ($^O
}
}
}
- return undef;
+ return;
}
}
@@ -272,7 +272,7 @@ sub untaint_hostname {
sub untaint_var {
no re 'taint'; # override a "use re 'taint'" from outer scope
local ($_) = @_;
- return undef unless defined;
+ return unless defined;
unless (ref) {
local($1); # avoid Perl taint bug: tainted global $1 propagates taintedness
@@ -459,7 +459,7 @@ sub parse_rfc822_date {
$dd = $1; $mon = lc($2); $yyyy = $3;
} else {
dbg("util: time cannot be parsed: $date");
- return undef;
+ return;
}
# handle two and three digit dates as specified by RFC 2822
@@ -547,7 +547,7 @@ sub parse_rfc822_date {
} or do {
my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
dbg("util: time cannot be parsed: $date, $yyyy-$mmm-$dd $hh:$mm:$ss, $eval_stat");
- return undef;
+ return;
};
if ($tzoff =~ /([-+])(\d\d)(\d\d)$/) # convert to seconds difference
@@ -1366,7 +1366,7 @@ sub first_date {
my $time = parse_rfc822_date($string);
return $time if defined($time) && $time;
}
- return undef;
+ return;
}
sub receive_date {
@@ -1614,7 +1614,7 @@ sub regexp_remove_delimiters {
my $delim;
if (!defined $re || $re eq '') {
warn "cannot remove delimiters from null regexp";
- return undef; # invalid
+ return; # invalid
}
elsif ($re =~ s/^m{//) { # m{foo/bar}
$delim = '}';
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/Progress.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/Progress.pm?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/Progress.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/Progress.pm Tue Jul 26 23:34:52 2011
@@ -86,7 +86,7 @@ sub new {
if (!exists($args->{total}) || $args->{total} < 1) {
warn "progress: must provide a total value > 1";
- return undef;
+ return;
}
my $self = {
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Tue Jul 26 23:34:52 2011
@@ -47,7 +47,8 @@ BEGIN {
require IO::Socket::INET;
*new_io_socket_inetx = sub { IO::Socket::INET->new(@_); };
*ip_or_name_to_ip = sub {
- my $in_addr = (gethostbyname(shift))[4] or return undef;
+ my $in_addr = (gethostbyname(shift))[4];
+ $in_addr or return;
Socket::inet_ntoa($in_addr);
};
*peer_info_from_socket = sub {
@@ -66,8 +67,8 @@ BEGIN {
Socket6::getaddrinfo(
shift, '', Socket::AF_UNSPEC(), Socket::SOCK_STREAM()
)
- )[3]
- or return undef;
+ )[3];
+ $addr or return;
$addr = (Socket6::getnameinfo($addr, Socket6::NI_NUMERICHOST()))[0];
};
*peer_info_from_socket = sub {
@@ -2745,7 +2746,7 @@ sub syswrite_full_buffer {
|| (exists &Errno::EWOULDBLOCK && $! == &Errno::EWOULDBLOCK))
{
# an error that wasn't non-blocking I/O-related. that's serious
- return undef;
+ return;
}
# errcode says to try again
}
Modified: spamassassin/trunk/xt/60_perlcritic.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/60_perlcritic.t?rev=1151293&r1=1151292&r2=1151293&view=diff
==============================================================================
--- spamassassin/trunk/xt/60_perlcritic.t (original)
+++ spamassassin/trunk/xt/60_perlcritic.t Tue Jul 26 23:34:52 2011
@@ -29,7 +29,7 @@ print RC q{
severity = 5
verbose = 10
- exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
+ exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
[TestingAndDebugging::ProhibitNoStrict]
allow = refs