From 78a3bbd585b7ee0961dee45163c36904a419388b Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 9 Apr 2017 15:42:49 +0100
Subject: [PATCH 1/1] compiler quietening

---
 src/src/pdkim/pdkim.c | 1 -
 src/src/tls-openssl.c | 2 +-
 src/src/transport.c   | 2 --
 src/src/verify.c      | 5 +++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 5fc6045d0..e4384d7f7 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -1596,7 +1596,6 @@ while (sig)
   else
     {
     ev_ctx vctx;
-    pdkim_pubkey * p;
 
     /* Make sure we have all required signature tags */
     if (!(  sig->domain        && *sig->domain
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 8018d220b..ead41c037 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -727,7 +727,7 @@ if (Ustrcmp(exp_curve, "auto") == 0)
 #if OPENSSL_VERSION_NUMBER < 0x10002000L
   DEBUG(D_tls) debug_printf(
     "ECDH OpenSSL < 1.0.2: temp key parameter settings: overriding \"auto\" with \"prime256v1\"\n");
-  exp_curve = "prime256v1";
+  exp_curve = US"prime256v1";
 #else
 # if defined SSL_CTRL_SET_ECDH_AUTO
   DEBUG(D_tls) debug_printf(
diff --git a/src/src/transport.c b/src/src/transport.c
index ee5120663..594e02cde 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1934,8 +1934,6 @@ void
 transport_do_pass_socket(const uschar *transport_name, const uschar *hostname,
   const uschar *hostaddress, uschar *id, int socket_fd)
 {
-pid_t pid;
-int status;
 int i = 20;
 const uschar **argv;
 
diff --git a/src/src/verify.c b/src/src/verify.c
index b28d15a71..794c76c4e 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1221,6 +1221,7 @@ void
 cutthrough_data_puts(uschar * cp, int n)
 {
 if (cutthrough.delivery) (void) cutthrough_puts(cp, n);
+return;
 }
 
 
@@ -1353,7 +1354,7 @@ return TRUE;
 
 
 static void
-close_cutthrough_connection(const char * why)
+close_cutthrough_connection(const uschar * why)
 {
 int fd = cutthrough.fd;
 if(fd >= 0)
@@ -1428,7 +1429,7 @@ for (addr = &cutthrough.addr; addr; addr = addr->next)
     {
     case '2':
       delivery_log(LOG_MAIN, addr, (int)'>', NULL);
-      close_cutthrough_connection("delivered");
+      close_cutthrough_connection(US"delivered");
       break;
 
     case '4':
-- 
2.30.2