X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e4d0fc93cfb659b22f94b64649cc23e536039580..040721f2bc088d5e717c0475975ed6158352dce6:/src/src/spam.c

diff --git a/src/src/spam.c b/src/src/spam.c
index d4b95b2f9..477ab62b4 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -265,9 +265,7 @@ if (spam_ok && Ustrcmp(prev_user_name, user_name) == 0)
   return override ? OK : spam_rc;
 
 /* make sure the eml mbox file is spooled up */
-mbox_file = spool_mbox(&mbox_size, NULL);
-
-if (mbox_file == NULL)
+if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL)))
   {
   /* error while spooling */
   log_write(0, LOG_MAIN|LOG_PANIC,
@@ -287,8 +285,7 @@ start = time(NULL);
   /* Check how many spamd servers we have
      and register their addresses */
   sep = 0;				/* default colon-sep */
-  while ((address = string_nextinlist(&spamd_address_list_ptr, &sep,
-				      NULL, 0)) != NULL)
+  while ((address = string_nextinlist(&spamd_address_list_ptr, &sep, NULL, 0)))
     {
     const uschar * sublist;
     int sublist_sep = -(int)' ';	/* default space-sep */