tidying

5 files changed, 14 insertions, 12 deletions

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index cd95d99ff..82e4dfaff 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -29903,9 +29903,10 @@ warn   hosts           = +internal_hosts
 warn   message         = Remove internal headers
        remove_header   = $acl_c_ihdrs
 .endd
-Removed header lines are accumulated during the MAIL, RCPT, and predata ACLs.
-They are removed from the message before processing the DATA and MIME ACLs.
-There is no harm in attempting to remove the same header twice nor is removing
+Header names for removal are accumulated during the MAIL, RCPT, and predata ACLs.
+Matching header lines are removed from the message before processing the DATA and MIME ACLs.
+If multiple header lines match, all are removed.
+There is no harm in attempting to remove the same header twice nor in removing
 a non-existent header. Further header lines to be removed may be accumulated
 during the DATA and MIME ACLs, after which they are removed from the message,
 if present. In the case of non-SMTP messages, headers to be removed are
diff --git a/src/src/acl.c b/src/src/acl.c
index d243ff4af..1fa5c1f63 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1070,7 +1070,7 @@ Returns:    nothing
 static void
 setup_remove_header(const uschar *hnames)
 {
-if (*hnames != 0)
+if (*hnames)
   acl_removed_headers = acl_removed_headers
     ? string_sprintf("%s : %s", acl_removed_headers, hnames)
     : string_copy(hnames);
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 7127518e2..68152d505 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -8531,7 +8531,7 @@ uschar * where;
 
 if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
   {
-  int pfd[2], channel_fd = cutthrough.cctx.sock, pid;
+  int channel_fd = cutthrough.cctx.sock;
 
   smtp_peer_options = cutthrough.peer_options;
   continue_sequence = 0;
@@ -8539,6 +8539,8 @@ if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
 #ifdef SUPPORT_TLS
   if (cutthrough.is_tls)
     {
+    int pfd[2], pid;
+
     smtp_peer_options |= OPTION_TLS;
     sending_ip_address = cutthrough.snd_ip;
     sending_port = cutthrough.snd_port;
diff --git a/src/src/dkim.c b/src/src/dkim.c
index edbeded5e..29ec29a96 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -702,7 +702,7 @@ if (dkim_domain)
 	{ errwhen = US"dkim_timestamps"; goto expand_bad; }
       else
 	xval = (tval = (unsigned long) time(NULL))
-	      + strtoul(dkim_timestamps_expanded, NULL, 10);
+	      + strtoul(CCS dkim_timestamps_expanded, NULL, 10);
 
     if (!(sig = pdkim_init_sign(&dkim_sign_ctx, dkim_signing_domain,
 			  dkim_signing_selector,
diff --git a/src/src/expand.c b/src/src/expand.c
index a1a70c718..2feaf957b 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4826,10 +4826,8 @@ while (*s != 0)
       uschar * server_name = NULL;
       host_item host;
       BOOL do_shutdown = TRUE;
-#ifdef SUPPORT_TLS
-      BOOL do_tls = FALSE;
-      void * tls_ctx = NULL;
-#endif
+      BOOL do_tls = FALSE;	/* Only set under SUPPORT_TLS */
+      void * tls_ctx = NULL;	/* ditto		      */
       blob reqstr;
 
       if (expand_forbid & RDO_READSOCK)
@@ -4934,8 +4932,9 @@ while (*s != 0)
 		  do_tls ? NULL : &reqstr);
 	  callout_address = NULL;
 	  if (fd < 0)
-              goto SOCK_FAIL;
-	  if (!do_tls) reqstr.len = 0;
+	    goto SOCK_FAIL;
+	  if (!do_tls)
+	    reqstr.len = 0;
           }
 
         /* Handle a Unix domain socket */