From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 14 Oct 2018 20:37:49 +0000 (+0100)
Subject: tidying
X-Git-Tag: exim-4.92-RC1~71
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/059f2aced50773fa38661a5a30c54260aee4bf55

tidying
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b4aae226f..3a98e0384 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -138,7 +138,7 @@ JH/29 Bug 2322: A "fail" command in a non-system filter (file) now fires the
       msg:fail:internal event.  Developement by Matthias Kurz.
 
 JH/30 Bug 2329: Increase buffer size used for dns lookup from 2k, which was
-      far too smal for todays use of crypto signatures stored there.  Go all
+      far too small for todays use of crypto signatures stored there.  Go all
       the way to the max DNS message size of 64kB, even though this might be
       overmuch for IOT constrained device use.
 
diff --git a/src/src/malware.c b/src/src/malware.c
index 4b28760af..069a54483 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -191,11 +191,12 @@ static const pcre * fprot6d_re_virus = NULL;
 
 /******************************************************************************/
 
+#ifndef DISABLE_MAL_KAV
 /* Routine to check whether a system is big- or little-endian.
    Ripped from http://www.faqs.org/faqs/graphics/fileformats-faq/part4/section-7.html
    Needed for proper kavdaemon implementation. Sigh. */
-#define BIG_MY_ENDIAN      0
-#define LITTLE_MY_ENDIAN   1
+# define BIG_MY_ENDIAN      0
+# define LITTLE_MY_ENDIAN   1
 static int test_byte_order(void);
 static inline int
 test_byte_order()
@@ -204,6 +205,7 @@ test_byte_order()
   char *byte = CS  &word;
   return(byte[0] ? LITTLE_MY_ENDIAN : BIG_MY_ENDIAN);
 }
+#endif
 
 BOOL malware_ok = FALSE;
 
@@ -262,13 +264,6 @@ m_panic_defer_3(struct scan * scanent, const uschar * hostport,
 (void) close(fd_to_close);
 return m_panic_defer(scanent, hostport, str);
 }
-static inline int
-m_log_defer_3(struct scan * scanent, const uschar * hostport,
-  const uschar * str, int fd_to_close)
-{
-(void) close(fd_to_close);
-return m_log_defer(scanent, hostport, str);
-}
 
 /*************************************************/
 
@@ -2287,7 +2282,7 @@ malware_show_supported(FILE * f)
 {
 struct scan * sc;
 fprintf(f, "Malware:");
-for (sc = m_scans; sc->scancode != -1; sc++) fprintf(f, " %s", sc->name);
+for (sc = m_scans; sc->scancode != (scanner_t)-1; sc++) fprintf(f, " %s", sc->name);
 fprintf(f, "\n");
 }
 
diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
index 77cf623e7..c7415c357 100644
--- a/src/src/transports/smtp_socks.c
+++ b/src/src/transports/smtp_socks.c
@@ -85,7 +85,7 @@ else if (Ustrncmp(opt, "name=", 5) == 0)
 else if (Ustrncmp(opt, "pass=", 5) == 0)
   sob->auth_pwd = opt + 5;
 else if (Ustrncmp(opt, "port=", 5) == 0)
-  sob->port = atoi(opt + 5);
+  sob->port = atoi(CCS opt + 5);
 else if (Ustrncmp(opt, "tmo=", 4) == 0)
   sob->timeout = atoi(CCS opt + 4);
 else if (Ustrncmp(opt, "pri=", 4) == 0)
diff --git a/test/src/client.c b/test/src/client.c
index 5b998e269..3a6b4ad3d 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -429,7 +429,7 @@ if (certificate != NULL)
   {
   rc = gnutls_certificate_set_x509_key_file(x509_cred, CS certificate,
     CS privatekey, GNUTLS_X509_FMT_PEM);
-  if (rc < 0) gnutls_error("gnutls_certificate", rc);
+  if (rc < 0) gnutls_error(US"gnutls_certificate", rc);
   }
 
 /* Associate the parameters with the x509 credentials structure. */
@@ -1169,7 +1169,7 @@ SSL_CTX_set_info_callback(srv.ctx, (void (*)())info_callback);
 #ifdef HAVE_GNUTLS
 if (certfile != NULL) printf("Certificate file = %s\n", certfile);
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);
-tls_init(certfile, keyfile);
+tls_init(US certfile, US keyfile);
 tls_session = tls_session_init();
 #ifdef HAVE_OCSP
 if (ocsp_stapling)
diff --git a/test/src/server.c b/test/src/server.c
index d433ebe0e..fe1c79f02 100644
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -267,7 +267,7 @@ if (na < argc) connection_count = atoi(argv[na]);
 if (initial_pause > 0)
   {
   if (debug)
-    printf("%d: Inital pause of %d seconds\n", time(NULL), initial_pause);
+    printf("%ld: Inital pause of %d seconds\n", (long)time(NULL), initial_pause);
   else
     printf("Inital pause of %d seconds\n", initial_pause);
   while (initial_pause > 0)