tidying

diff --git a/src/src/exim.c b/src/src/exim.c
index 63ac620e7b1351b36e4d73294a809d4486e9fbdf..9d87c8daa468a76919b68717dd57f6adbe71d18a 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -4627,10 +4627,10 @@ turn into a queue runner, with an optional starting message id. */
 if (queue_interval == 0 && !f.daemon_listen)
   {
   DEBUG(D_queue_run) debug_printf("Single queue run%s%s%s%s\n",
-    (start_queue_run_id == NULL)? US"" : US" starting at ",
-    (start_queue_run_id == NULL)? US"" : start_queue_run_id,
-    (stop_queue_run_id == NULL)?  US"" : US" stopping at ",
-    (stop_queue_run_id == NULL)?  US"" : stop_queue_run_id);
+    start_queue_run_id ? US" starting at " : US"",
+    start_queue_run_id ? start_queue_run_id: US"",
+    stop_queue_run_id ?  US" stopping at " : US"",
+    stop_queue_run_id ?  stop_queue_run_id : US"");
   if (*queue_name)
     set_process_info("running the '%s' queue (single queue run)", queue_name);
   else

diff --git a/src/src/receive.c b/src/src/receive.c
index 8f3bfefacd162cfaaa75d85b0f765e0322983034..5e8b6fbba758d42599e468103f726c36e96862e2 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1404,7 +1404,6 @@ for (header_line * my_headerlist = header_list; my_headerlist;
     goto DO_MIME_ACL;
     }
 
-mime_part_count = -1;
 DEBUG(D_receive) debug_printf("No Content-Type: header - presumably not a MIME message.\n");
 return TRUE;