From 39755c16ba29d951df230944f652c5da9a445c0f Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 13 Dec 2015 13:38:02 +0000
Subject: [PATCH] tidying

---
 src/src/EDITME     |  3 +++
 src/src/deliver.c  |  2 +-
 src/src/host.c     |  4 ++--
 src/src/readconf.c | 32 +++++++++++++++-----------------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/src/EDITME b/src/src/EDITME
index de25abd5e..e10546d2c 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -496,6 +496,9 @@ EXIM_MONITOR=eximon.bin
 # Note: Enabling this unconditionally overrides DISABLE_DNSSEC
 # EXPERIMENTAL_DANE=yes
 
+# Uncomment the following to include extra information in fail DSN message (bounces)
+# EXPERIMENTAL_DSN_INFO=yes
+
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
 ###############################################################################
diff --git a/src/src/deliver.c b/src/src/deliver.c
index b816b1a77..9c2839b27 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -703,7 +703,7 @@ if (LOGGING(incoming_interface) && LOGGING(outgoing_interface)
   s = LOGGING(outgoing_port)
     ? string_append(s, sizep, ptrp, 2, US"]:",
 	string_sprintf("%d", sending_port))
-    : string_cat(s, sizep, ptrp, "]", 1);
+    : string_cat(s, sizep, ptrp, US"]", 1);
   }
 return s;
 }
diff --git a/src/src/host.c b/src/src/host.c
index 4099a7506..90ba852d8 100644
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -1184,7 +1184,7 @@ ipv6_nmtoa(int * binary, uschar * buffer)
 {
 int i, j, k;
 uschar * c = buffer;
-uschar * d;
+uschar * d = NULL;	/* shut insufficiently "clever" compiler up */
 
 for (i = 0; i < 4; i++)
   {			/* expand to text */
@@ -1217,7 +1217,7 @@ if (k >= 0)
   c = d + 2*(k+1);
   if (d == buffer) c--;	/* need extra colon */
   *d++ = ':';	/* 1st 0 */
-  while (*d++ = *c++) ;
+  while ((*d++ = *c++)) ;
   }
 else
   d = c;
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 30ff757ac..8a237d38a 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -4289,44 +4289,42 @@ for (i = config_lines; i; i = i->next)
 
   /* # lines */
   if (current[0] == '#')
-    {
-    puts(current);
-    continue;
-    }
+    puts(CCS current);
 
   /* begin lines are left aligned */
-  if (strncmp(current, "begin", 5) == 0 && isspace(current[5]))
+  else if (Ustrncmp(current, "begin", 5) == 0 && isspace(current[5]))
     {
-    puts(current);
+    puts(CCS current);
     indent = TS;
-    continue;
     }
 
   /* router/acl/transport block names */
-  if (current[strlen(current)-1] == ':' && !strchr(current, '='))
+  else if (current[strlen(current)-1] == ':' && !Ustrchr(current, '='))
     {
     printf("%*s%s\n", TS, "", current);
     indent = 2 * TS;
-    continue;
     }
 
   /* hidden lines (MACROS or prefixed with hide) */
-  if (!admin && (isupper(*current)
-    || (strncmp(current, "hide", 4) == 0 && isspace(current[4]))))
+  else if (  !admin
+	  && (  isupper(*current)
+	     || Ustrncmp(current, "hide", 4) == 0 && isspace(current[4])
+	     )
+	  )
     {
-    if (p = strchr(current, '='))
+    if (p = Ustrchr(current, '='))
       {
       *p = '\0';
       printf("%*s%s = %s\n", indent, "", current, hidden);
       }
     /* e.g.: hide split_spool_directory */
-    else printf("%*s\n", indent, hidden);
-    continue;
+    else
+      printf("%*s\n", indent, hidden);
     }
 
-  /* rest is public */
-  printf("%*s%s\n", indent, "", current);
-  continue;
+  else
+    /* rest is public */
+    printf("%*s%s\n", indent, "", current);
   }
 }
 
-- 
2.25.1