Compiler quietening

diff --git a/src/src/dns.c b/src/src/dns.c
index 64958d9830e34e3e7975e26eb1c64978a41095f4..a239bec3063a46a2f29c5d13507467e3a8d1faee 100644 (file)
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -40,7 +40,6 @@ fakens_search(const uschar *domain, int type, uschar *answerptr, int size)
 {
 int len = Ustrlen(domain);
 int asize = size;                  /* Locally modified */
 {
 int len = Ustrlen(domain);
 int asize = size;                  /* Locally modified */

-uschar *endname;

 uschar name[256];
 uschar utilname[256];
 uschar *aptr = answerptr;          /* Locally modified */
 uschar name[256];
 uschar utilname[256];
 uschar *aptr = answerptr;          /* Locally modified */


@@ -51,7 +50,6 @@ struct stat statbuf;
 if (domain[len - 1] == '.') len--;
 Ustrncpy(name, domain, len);
 name[len] = 0;
 if (domain[len - 1] == '.') len--;
 Ustrncpy(name, domain, len);
 name[len] = 0;

-endname = name + len;

 
 /* Look for the fakens utility, and if it exists, call it. */
 
 
 /* Look for the fakens utility, and if it exists, call it. */
 


@@ -86,7 +84,7 @@ if (stat(CS utilname, &statbuf) >= 0)
     asize -= rc;      /* may need to be passed on to res_search(). */
     }
 
     asize -= rc;      /* may need to be passed on to res_search(). */
     }
 

-  /* If we ran out of output buffer before exhasting the return,
+  /* If we ran out of output buffer before exhausting the return,

   carry on reading and counting it. */
 
   if (asize == 0)
   carry on reading and counting it. */
 
   if (asize == 0)

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index cf0a5d64276e32623dd6f26af3d46da4e511d092..711ee8611983b10b5116c93464ae941576417044 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -3293,7 +3293,7 @@ while (done <= 0)
   pid_t pid;
   int start, end, sender_domain, recipient_domain;
   int ptr, size, rc;
   pid_t pid;
   int start, end, sender_domain, recipient_domain;
   int ptr, size, rc;

-  int c, i;
+  int c;

   auth_instance *au;
   uschar *orcpt = NULL;
   int flags;
   auth_instance *au;
   uschar *orcpt = NULL;
   int flags;

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index e1dcd77bc67b3bf8dcdcb3869e32e747b0f36021..d8377fd8cc8c86d46edb76b4031fa00120c00afb 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -708,7 +708,7 @@ if (  (nid = OBJ_sn2nid       (CCS exp_curve)) == NID_undef
 
 if (!(ecdh = EC_KEY_new_by_curve_name(nid)))
   {
 
 if (!(ecdh = EC_KEY_new_by_curve_name(nid)))
   {

-  tls_error("Unable to create ec curve", host, NULL);
+  tls_error(US"Unable to create ec curve", host, NULL);

   return FALSE;
   }
 
   return FALSE;
   }
 

diff --git a/src/src/utf8.c b/src/src/utf8.c
index a0ec0039199615b32b3390437511ff9021ebab2b..8a7cf38a346da35e4c60a07cbc57e3de71a0fe06 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -127,7 +127,7 @@ if ((rc = punycode_decode(p_len, CCS alabel+4, &p_len, p, NULL)) != PUNYCODE_SUC
   return NULL;
   }
 
   return NULL;
   }
 

-s = stringprep_ucs4_to_utf8(p, p_len, NULL, &p_len);
+s = US stringprep_ucs4_to_utf8(p, p_len, NULL, &p_len);

 res = string_copyn(s, p_len);
 free(s);
 return res;
 res = string_copyn(s, p_len);
 free(s);
 return res;