From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 1 May 2017 11:08:17 +0000 (+0100)
Subject: tidying: coverity
X-Git-Tag: exim-4_90_RC1~175
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/6c140c0137225dff8b08d62df9c4ecc1093c6cbc?hp=b7d3afcfad94edf99a8dbc50ab670ded417e6bea

tidying: coverity
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 56642c6aa..fe156c696 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4499,10 +4499,10 @@ for (delivery_count = 0; addr_remote; delivery_count++)
 
     /* Set a flag indicating whether there are further addresses that list
     the continued host. This tells the transport to leave the channel open,
-    but not to pass it to another delivery process. */
-    /*XXX really the flag should be settable even by an initial proces
-    (not continue_transport dependent).  Need to check that uses of it
-    are independent. */
+    but not to pass it to another delivery process. We'd like to do that
+    for non-continue_transport cases too but the knowlege of which host is
+    connected to is too hard to manage.  Perhaps we need a finer-grain
+    interface to the transport. */
 
     for (next = addr_remote; next && !continue_more; next = next->next)
       {
diff --git a/src/src/dkim_transport.c b/src/src/dkim_transport.c
index a654c2516..882fc8772 100644
--- a/src/src/dkim_transport.c
+++ b/src/src/dkim_transport.c
@@ -43,7 +43,7 @@ return TRUE;
 static BOOL
 dkt_send_file(int out_fd, int in_fd, off_t off, size_t size)
 {
-DEBUG(D_transport) debug_printf("send file fd=%d size=%l\n", out_fd, size - off);
+DEBUG(D_transport) debug_printf("send file fd=%d size=%u\n", out_fd, (unsigned)(size - off));
 
 /*XXX should implement timeout, like transport_write_block_fd() ? */
 
@@ -204,7 +204,7 @@ int dkim_fd;
 int save_errno = 0;
 BOOL rc;
 uschar * dkim_spool_name, * dkim_signature;
-int sread = 0, wwritten = 0, siglen, options;
+int sread = 0, wwritten = 0, siglen = 0, options;
 off_t k_file_size;
 const uschar * errstr;