tidying

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 83c2bafec7240ff5d0e7c114ee15ab313f1b8dc9..d4ebf464d7fc7f593bedd4a00a0dc42536bbcf5e 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -8965,7 +8965,7 @@ The field selectors marked as "RFC4514" above
 output a Distinguished Name string which is
 not quite
 parseable by Exim as a comma-separated tagged list
-(the exceptions being elements containin commas).
+(the exceptions being elements containing commas).
 RDN elements of a single type may be selected by
 a modifier of the type label; if so the expansion
 result is a list (newline-separated by default).

diff --git a/src/src/exim.c b/src/src/exim.c
index 470d44dcec00fba78b177c5268f69c1b0b967671..3eca43b4960ee7ca9c56c697444e8aace0c434b5 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1029,11 +1029,9 @@ DEBUG(D_any) do {
   utf8_version_report(f);
 #endif
 
-  for (authi = auths_available; *authi->driver_name != '\0'; ++authi) {
-    if (authi->version_report) {
+  for (authi = auths_available; *authi->driver_name != '\0'; ++authi)
+    if (authi->version_report)
       (*authi->version_report)(f);
-    }
-  }
 
   /* PCRE_PRERELEASE is either defined and empty or a bare sequence of
   characters; unless it's an ancient version of PCRE in which case it
@@ -1053,10 +1051,8 @@ DEBUG(D_any) do {
 
   init_lookup_list();
   for (i = 0; i < lookup_list_count; i++)
-    {
     if (lookup_list[i]->version_report)
       lookup_list[i]->version_report(f);
-    }
 
 #ifdef WHITELIST_D_MACROS
   fprintf(f, "WHITELIST_D_MACROS: \"%s\"\n", WHITELIST_D_MACROS);

diff --git a/src/src/functions.h b/src/src/functions.h
index 74198a52c5787828fa0035925ce21e078ecf853e..d720f235e6dfdb4f4a590e7de7a9ea712488daa4 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -465,6 +465,9 @@ extern void    tree_walk(tree_node *, void (*)(uschar*, uschar*, void*), void *)
 #ifdef WITH_CONTENT_SCAN
 extern void    unspool_mbox(void);
 #endif
+#ifdef EXPERIMENTAL_INTERNATIONAL
+extern void    utf8_version_report(FILE *);
+#endif
 
 extern int     verify_address(address_item *, FILE *, int, int, int, int,
                  uschar *, uschar *, BOOL *);

diff --git a/src/src/imap_utf7.c b/src/src/imap_utf7.c
index 10cc1f7fa15dc29de644ea860e15e98cf112271c..b2695cdb913169338eb9672d0454578119807566 100644 (file)
--- a/src/src/imap_utf7.c
+++ b/src/src/imap_utf7.c
@@ -25,7 +25,7 @@ uschar *outptr = outbuf;
 iconv_t icd;
 #endif
 
-if (!specials) specials = "";
+if (!specials) specials = US"";
 
 /* Pass over the string. If it consists entirely of "normal" characters
    (possibly with leading seps), return it as is. */
@@ -37,7 +37,7 @@ for (s = string; *s; s++)
      || *s < 0x20
      || strchr("./&", *s)
      || *s == sep
-     || strchr(specials, *s)
+     || Ustrchr(specials, *s)
      )
     break;
   }
@@ -49,7 +49,7 @@ sptr = string;
 slen = Ustrlen(string);
 
 #if HAVE_ICONV
-if ((icd = iconv_open(US"UTF-16BE", charset)) == (iconv_t)-1)
+if ((icd = iconv_open("UTF-16BE", CCS charset)) == (iconv_t)-1)
   {
   *error = string_sprintf(
        "imapfolder: iconv_open(\"UTF-16BE\", \"%s\") failed: %s%s",

diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index d06455e61f1119e90b68d43e0192cbc031cd6f4f..2e6805dc900c196be989610d88c098992f47b496 100644 (file)
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -230,7 +230,7 @@ for (;;)
   else if (strncmpic(keystring, US"retry_", 6) == 0)
     {
     int retries;
-    if ((retries = (int)strtol(keystring + 6, CSS &keystring, 0)) < 0)
+    if ((retries = (int)strtol(CCS keystring + 6, CSS &keystring, 0)) < 0)
       {
       *errmsg = US"unsupported dnsdb retry count";
       return DEFER;
@@ -548,7 +548,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
          p += rc;
          GETLONG(serial, p); GETLONG(refresh, p);
          GETLONG(retry,  p); GETLONG(expire,  p); GETLONG(minimum, p);
-         sprintf(CS s, "%c%d%c%d%c%d%c%d%c%d",
+         sprintf(CS s, "%c%lu%c%lu%c%lu%c%lu%c%lu",
            *outsep2, serial, *outsep2, refresh,
            *outsep2, retry,  *outsep2, expire,  *outsep2, minimum);
          yield = string_cat(yield, &size, &ptr, s, Ustrlen(s));

diff --git a/src/src/mime.c b/src/src/mime.c
index 6bffa789776d499e7006c5590b4c558483d3af92..e1ff98b9305d7fb427dbf511b5c47970e911dd90 100644 (file)
--- a/src/src/mime.c
+++ b/src/src/mime.c
@@ -640,8 +640,6 @@ while(1)
         mh < mime_header_list + mime_header_list_size;
         mh++) if (strncmpic(mh->name, header, mh->namelen) == 0)
       {
-      uschar * header_value = NULL;
-      int header_value_len = 0;
       uschar * p = header + mh->namelen;
       uschar * q;
 
@@ -671,8 +669,8 @@ while(1)
          DEBUG(D_acl) debug_printf("  considering paramlist '%s'\n", p);
 
          if (  !mime_filename
-            && strncmpic("content-disposition:", header, 20) == 0
-            && strncmpic("filename*", p, 9) == 0
+            && strncmpic(CUS"content-disposition:", header, 20) == 0
+            && strncmpic(CUS"filename*", p, 9) == 0
             )
            {                                   /* RFC 2231 filename */
            uschar * q;
@@ -765,7 +763,7 @@ while(1)
          if (*p) p++;
          }                             /* param scan on line */
 
-       if (strncmpic("content-disposition:", header, 20) == 0)
+       if (strncmpic(CUS"content-disposition:", header, 20) == 0)
          {
          if (decoding_failed) mime_filename = mime_fname_rfc2231;
 

diff --git a/src/src/spam.c b/src/src/spam.c
index 5bb973b4d0d757ca84cab301f1af1f4d0acc6a65..f7a34694b3f5339b8bd6dbd79261cab620e3bb4e 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -38,7 +38,7 @@ return 0;
 
 
 static int
-spamd_param(const uschar *param, spamd_address_container *spamd)
+spamd_param(const uschar * param, spamd_address_container * spamd)
 {
 static int timesinceday = -1;
 const uschar * s;
@@ -46,10 +46,10 @@ const uschar * name;
 
 /*XXX more clever parsing could discard embedded spaces? */
 
-if (sscanf(param, "pri=%u", &spamd->priority))
+if (sscanf(CCS param, "pri=%u", &spamd->priority))
   return 0; /* OK */
 
-if (sscanf(param, "weight=%u", &spamd->weight))
+if (sscanf(CCS param, "weight=%u", &spamd->weight))
   {
   if (spamd->weight == 0) /* this server disabled: skip it */
     return 1;
@@ -202,7 +202,6 @@ uschar *p,*q;
 int override = 0;
 time_t start;
 size_t read, wrote;
-struct sockaddr_un server;
 #ifndef NO_POLL_H
 struct pollfd pollfd;
 #else                               /* Patch posted by Erik ? for OS X */

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 530266d3674660fd82f1954b43eeb4fe960f468d..64e2fb061298734d69ffd1be7d45c9ba8d18ecbc 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -465,7 +465,6 @@ X509 * cert = X509_STORE_CTX_get_current_cert(x509ctx);
 uschar dn[256];
 #ifdef EXPERIMENTAL_EVENT
 int depth = X509_STORE_CTX_get_error_depth(x509ctx);
-uschar * yield;
 BOOL dummy_called, optional = FALSE;
 #endif
 
@@ -1534,7 +1533,6 @@ tls_server_start(const uschar *require_ciphers)
 int rc;
 uschar *expciphers;
 tls_ext_ctx_cb *cbinfo;
-X509 * peercert;
 static uschar peerdn[256];
 static uschar cipherbuf[256];
 

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 7537e6e4b7f64b84c1b31090fca491e633285406..9554652ca3c7713abc6b7a558bd4350d17a7e010 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1388,7 +1388,6 @@ uschar *p;
 uschar buffer[4096];
 uschar inbuffer[4096];
 uschar outbuffer[4096];
-address_item * current_address;
 
 suppress_tls = suppress_tls;  /* stop compiler warning when no TLS support */
 

diff --git a/src/src/utf8.c b/src/src/utf8.c
index 7382205598f3681999e4bca2ae5d50c8340a85e0..a0ec0039199615b32b3390437511ff9021ebab2b 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -89,7 +89,7 @@ res = store_get(p_len+5);
 
 res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
 
-if ((rc = punycode_encode(ucs4_len, p, NULL, &p_len, res+4)) != PUNYCODE_SUCCESS)
+if ((rc = punycode_encode(ucs4_len, p, NULL, &p_len, CS res+4)) != PUNYCODE_SUCCESS)
   {
   DEBUG(D_expand) debug_printf("l_u2a: bad '%s'\n", punycode_strerror(rc));
   free(p);
@@ -106,7 +106,7 @@ return res;
 uschar *
 string_localpart_alabel_to_utf8(const uschar * alabel, uschar ** err)
 {
-size_t p_len = strlen(alabel);
+size_t p_len = Ustrlen(alabel);
 punycode_uint * p;
 uschar * s;
 uschar * res;