tidying

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b4aae226f18159861598252ebc6f80dd9ddf4543..3a98e0384c387bdec8b70b6c79cdb0879e7447a1 100644 (file)
--- 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 4b28760afc836f06c5887998e0ede3736f950ffa..069a544833f95b55b8dd096fd6f1c7664c3229b9 100644 (file)
--- 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 77cf623e75e4b73c0ed4142c17e0491650b4ef54..c7415c35703211bf4620ad19d19f4054546fc822 100644 (file)
--- 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 5b998e2699d6dfa02f7e401c1fb448a3c049a84b..3a6b4ad3db3222cc151bea2ae1133146d7abab79 100644 (file)
--- 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 d433ebe0e0331f1f0cbd4fb04027eb99d9249568..fe1c79f020d7d4be1cfc1176f39937d41b5a553a 100644 (file)
--- 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)