You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2004/01/09 00:28:38 UTC

svn commit: rev 6120 - in incubator/spamassassin/trunk: . spamd

Author: jm
Date: Thu Jan  8 15:28:38 2004
New Revision: 6120

Modified:
   incubator/spamassassin/trunk/MANIFEST
   incubator/spamassassin/trunk/spamd/utils.c
Log:
use of UNUSED_VARIABLE cannot be interspersed between variable declarations with older compilers

Modified: incubator/spamassassin/trunk/MANIFEST
==============================================================================
--- incubator/spamassassin/trunk/MANIFEST	(original)
+++ incubator/spamassassin/trunk/MANIFEST	Thu Jan  8 15:28:38 2004
@@ -25,6 +25,7 @@
 build/tag_weekly_mc
 build/update_devel
 build/update_stable
+build/configure
 spamd/config.h.in
 spamd/configure
 spamd/configure.in

Modified: incubator/spamassassin/trunk/spamd/utils.c
==============================================================================
--- incubator/spamassassin/trunk/spamd/utils.c	(original)
+++ incubator/spamassassin/trunk/spamd/utils.c	Thu Jan  8 15:28:38 2004
@@ -150,12 +150,6 @@
 {
   int nred;
 
-#ifndef SPAMC_SSL
-  UNUSED_VARIABLE(ssl);
-  UNUSED_VARIABLE(buf);
-  UNUSED_VARIABLE(nbytes);
-#endif
-
 #ifndef _WIN32
   sigfunc* sig;
 
@@ -166,11 +160,16 @@
 #endif
 
   do {
+
 #ifdef SPAMC_SSL
     nred = SSL_read (ssl, buf, nbytes);
 #else
+    UNUSED_VARIABLE(ssl);
+    UNUSED_VARIABLE(buf);
+    UNUSED_VARIABLE(nbytes);
     nred = 0;			/* never used */
 #endif
+
   } while(nred < 0 && errno == EWOULDBLOCK);
 
 #ifndef _WIN32