From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 9 Jul 2017 15:12:45 +0000 (+0100)
Subject: tidying
X-Git-Tag: exim-4_90_RC1~116
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/ef698bf6a7a59d28c93fca18e4509ca6c67d7dca

tidying
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index e5c951560..9b77f7d17 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -7077,7 +7077,7 @@ phase, to minimize cases of half-done things. */
 
 DEBUG(D_deliver)
   debug_printf(">>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>\n");
-cancel_cutthrough_connection(TRUE, "deliveries are done");
+cancel_cutthrough_connection(TRUE, US"deliveries are done");
 
 /* Root privilege is no longer needed */
 
@@ -8507,7 +8507,7 @@ if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
   }
 else
   {
-  cancel_cutthrough_connection(TRUE, "non-continued delivery");
+  cancel_cutthrough_connection(TRUE, US"non-continued delivery");
   (void) child_exec_exim(exec_type, FALSE, NULL, FALSE, 2, US"-Mc", message_id);
   }
 /* Control does not return here. */
diff --git a/src/src/dkim.c b/src/src/dkim.c
index 33e7bc84c..519deabcf 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -104,7 +104,7 @@ int rc;
 
 store_pool = POOL_PERM;
 if (  dkim_collect_input
-   && (rc = pdkim_feed(dkim_verify_ctx, CS data, len)) != PDKIM_OK)
+   && (rc = pdkim_feed(dkim_verify_ctx, data, len)) != PDKIM_OK)
   {
   dkim_collect_error = pdkim_errstr(rc);
   log_write(0, LOG_MAIN,
@@ -475,7 +475,7 @@ pdkim_signature *signature;
 int pdkim_canon;
 int pdkim_rc;
 int sread;
-char buf[4096];
+uschar buf[4096];
 int save_errno = 0;
 int old_pool = store_pool;
 
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 61e3161d4..d41b60f13 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -155,7 +155,7 @@ switch(status)
   case PDKIM_ERR_BUFFER_TOO_SMALL:	return US"BUFFER_TOO_SMALL";
   case PDKIM_SIGN_PRIVKEY_WRAP:	return US"PRIVKEY_WRAP";
   case PDKIM_SIGN_PRIVKEY_B64D:	return US"PRIVKEY_B64D";
-  default: return "(unknown)";
+  default: return US"(unknown)";
   }
 }
 
@@ -999,7 +999,7 @@ return PDKIM_OK;
 #define HEADER_BUFFER_FRAG_SIZE 256
 
 DLLEXPORT int
-pdkim_feed(pdkim_ctx *ctx, char *data, int len)
+pdkim_feed(pdkim_ctx * ctx, uschar * data, int len)
 {
 int p, rc;
 
diff --git a/src/src/pdkim/pdkim.h b/src/src/pdkim/pdkim.h
index 8c477f744..78e3c3c8b 100644
--- a/src/src/pdkim/pdkim.h
+++ b/src/src/pdkim/pdkim.h
@@ -299,7 +299,7 @@ int        pdkim_set_optional (pdkim_ctx *, char *, char *,int, int,
                                unsigned long);
 
 DLLEXPORT
-int        pdkim_feed         (pdkim_ctx *, char *, int);
+int        pdkim_feed         (pdkim_ctx *, uschar *, int);
 DLLEXPORT
 int        pdkim_feed_finish  (pdkim_ctx *, pdkim_signature **, const uschar **);
 
diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index 8ca468a85..de5830d64 100644
--- a/src/src/spool_mbox.c
+++ b/src/src/spool_mbox.c
@@ -148,7 +148,7 @@ if (!spool_mbox_ok)
     if (!spool_file_wireformat || source_file_override)
       j = fread(buffer, 1, sizeof(buffer), data_file);
     else						/* needs CRLF -> NL */
-      if ((s = fgets(buffer, sizeof(buffer), data_file)))
+      if ((s = US fgets(CS buffer, sizeof(buffer), data_file)))
 	{
 	uschar * p = s + Ustrlen(s) - 1;
 
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index ab76492bc..19342358a 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2576,8 +2576,8 @@ SSL *ssl = is_server ? server_ssl : client_ssl;
 static uschar * corked = NULL;
 static int c_size = 0, c_len = 0;
 
-DEBUG(D_tls) debug_printf("%s(%p, %d%s)\n", __FUNCTION__,
-  buff, len, more ? ", more" : "");
+DEBUG(D_tls) debug_printf("%s(%p, %lu%s)\n", __FUNCTION__,
+  buff, (ulong)len, more ? ", more" : "");
 
 /* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
 "more" is notified.  This hack is only ok if small amounts are involved AND only