[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/46473d31e2aa9db8aeff247667fe0b3770573a6d

Commit:     46473d31e2aa9db8aeff247667fe0b3770573a6d
Parent:     545897766d1b6705258ebd7372d7e334ab1576eb
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Mar 1 16:36:19 2020 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 8 20:00:15 2020 +0000

    tidying
---
 src/src/exim.c    | 8 ++++----
 src/src/receive.c | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/src/exim.c b/src/src/exim.c
index 63ac620..9d87c8d 100644
--- 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 8f3bfef..5e8b6fb 100644
--- 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;