Compiler quietening

3 files changed, 7 insertions, 4 deletions

diff --git a/src/src/malware.c b/src/src/malware.c
index 141c6ea16..96af1e8c6 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -886,7 +886,7 @@ if (!malware_ok)
 	      string_sprintf("unable to read result (%s)", strerror(errno)),
 	      sock);
 
-	  for (p[bread] = '\0'; q = Ustrchr(p, '\n'); p = q+1)
+	  for (p[bread] = '\0'; (q = Ustrchr(p, '\n')); p = q+1)
 	    {
 	    *q = '\0';
 
@@ -1880,6 +1880,9 @@ if (!malware_ok)
 
 	      /* here for any unexpected response from the scanner */
 	      goto endloop;
+
+	    case AVA_DONE:	log_write(0, LOG_PANIC, "%s:%d:%s: should not happen",
+			    __FILE__, __LINE__, __FUNCTION__);
 	    }
 	  }
 	}
diff --git a/src/src/spam.c b/src/src/spam.c
index ca8d20720..457aa3a36 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -297,7 +297,7 @@ start = time(NULL);
     sd = (spamd_address_container *)store_get(sizeof(spamd_address_container));
 
     for (sublist = address, args = 0, spamd_param_init(sd);
-	 s = string_nextinlist(&sublist, &sublist_sep, NULL, 0);
+	 (s = string_nextinlist(&sublist, &sublist_sep, NULL, 0));
 	 args++
 	 )
       {
diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index 72808a7ad..19db0408f 100644
--- a/src/src/tlscert-openssl.c
+++ b/src/src/tlscert-openssl.c
@@ -127,7 +127,7 @@ else
   {
   struct tm tm;
   struct tm * tm_p = &tm;
-  BOOL mod_tz;
+  BOOL mod_tz = TRUE;
   uschar * tz = to_tz(US"GMT0");    /* need to call strptime with baseline TZ */
 
   /* Parse OpenSSL ASN1_TIME_print output.  A shame there seems to
@@ -164,7 +164,7 @@ else
       }
     }
 
-  if (mod_tz);
+  if (mod_tz)
     restore_tz(tz);
   }
 BIO_free(bp);