From aa7751be078fe9a20efa2cf2a8856fadb98f4178 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 28 Jun 2015 15:14:02 +0100
Subject: [PATCH] Compiler quietening

---
 src/src/dns.c         | 4 +---
 src/src/smtp_in.c     | 2 +-
 src/src/tls-openssl.c | 2 +-
 src/src/utf8.c        | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/src/dns.c b/src/src/dns.c
index 64958d983..a239bec30 100644
--- 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 */
-uschar *endname;
 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;
-endname = name + len;
 
 /* 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(). */
     }
 
-  /* 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)
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index cf0a5d642..711ee8611 100644
--- 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;
-  int c, i;
+  int c;
   auth_instance *au;
   uschar *orcpt = NULL;
   int flags;
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index e1dcd77bc..d8377fd8c 100644
--- 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)))
   {
-  tls_error("Unable to create ec curve", host, NULL);
+  tls_error(US"Unable to create ec curve", host, NULL);
   return FALSE;
   }
 
diff --git a/src/src/utf8.c b/src/src/utf8.c
index a0ec00391..8a7cf38a3 100644
--- 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;
   }
 
-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;
-- 
2.30.2