svn commit: r162061 - /spamassassin/trunk/spamassassin.raw /spamassassin/trunk/spamd/spamd.raw

[qu...@apache.org]

Author: quinlan
Date: Wed Apr 20 13:22:24 2005
New Revision: 162061

URL: http://svn.apache.org/viewcvs?rev=162061&view=rev
Log:
fix some weird spacing

Modified:
    spamassassin/trunk/spamassassin.raw
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?rev=162061&r1=162060&r2=162061&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Wed Apr 20 13:22:24 2005
@@ -236,16 +236,16 @@
   }
 );
 
-if ( $opt{'lint'} ) {
+if ($opt{'lint'}) {
   $spamtest->debug_diagnostics();
   my $res = $spamtest->lint_rules();
-  warn "lint: $res issues detected.  please rerun with debug enabled for more information.\n" if ($res);
-  exit $res ? 1: 0;
+  warn "lint: $res issues detected, please rerun with debug enabled for more information\n" if ($res);
+  exit $res ? 1 : 0;
 }
 
-if ( $opt{'remove-addr-from-whitelist'}
-  or $opt{'add-addr-to-whitelist'}
-  or $opt{'add-addr-to-blacklist'} )
+if ($opt{'remove-addr-from-whitelist'} ||
+    $opt{'add-addr-to-whitelist'} ||
+    $opt{'add-addr-to-blacklist'})
 {
   $spamtest->init(1);
 

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamd/spamd.raw?rev=162061&r1=162060&r2=162061&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Wed Apr 20 13:22:24 2005
@@ -336,23 +336,21 @@
 # gets mapped to --syslog=stderr and such --syslog-socket=file. An internal
 # socket of 'none' means as much as --syslog=null. Sounds complicated? It is.
 # But it works.
-my $log_socket = lc( $opt{'syslog-socket'} ) || 'unix';
+my $log_socket = lc($opt{'syslog-socket'}) || 'unix';
 
 # This is the default log file; it can be changed on the command line
 # via a --syslog flag containing non-word characters.
 my $log_file = "spamd.log";
 
 # A specific log file was given (--syslog=/path/to/file).
-if ( $log_facility =~ /[^a-z0-9]/ ) {
-  $log_file   = $log_facility;
+if ($log_facility =~ /[^a-z0-9]/) {
+  $log_file = $log_facility;
   $log_socket = 'file';
 }
-
 # The generic log file was requested (--syslog=file).
-elsif ( lc($log_facility) eq 'file' ) {
+elsif (lc($log_facility) eq 'file') {
   $log_socket = 'file';
 }
-
 # The casing is kept only if the facility specified a file.
 else {
   $log_facility = lc($log_facility);
@@ -360,19 +358,18 @@
 
 # Either above or at the command line the socket was set
 # to 'file' (--syslog-socket=file).
-if ( $log_socket eq 'file' ) {
+if ($log_socket eq 'file') {
   $log_facility = 'file';
 }
-
 # The socket 'none' (--syslog-socket=none) historically
 # represents logging to STDERR.
-elsif ( $log_socket eq 'none' ) {
+elsif ($log_socket eq 'none') {
   $log_facility = 'stderr';
 }
 
 # Either above or at the command line the facility was set
 # to 'stderr' (--syslog=stderr).
-if ( $log_facility eq 'stderr' ) {
+if ($log_facility eq 'stderr') {
   $log_socket = 'file';
 }
 
@@ -383,7 +380,7 @@
 
 # Logging via syslog is requested. Falling back to INET and then STDERR
 # if opening a UNIX socket fails.
-if ( $log_socket ne 'file' and $log_facility ne 'null' ) {
+if ($log_socket ne 'file' && $log_facility ne 'null') {
   dbg("logger: trying to connect to syslog/${log_socket}...\n");
   eval {
     defined( setlogsock($log_socket) ) || die $!;