From 1e1d5443ae8072e23f83230ee3f1ece792dbf62f Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 8 Oct 2018 14:23:38 +0100
Subject: [PATCH] tidying

---
 src/OS/os.h-Linux  | 3 +++
 src/src/expand.c   | 2 +-
 src/src/readconf.c | 2 +-
 src/src/smtp_out.c | 9 ++++-----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 539eeea33..63cf9babd 100644
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -83,6 +83,9 @@ then change the 0 to 1 in the next block. */
 # define MSG_FASTOPEN 0x20000000
 #endif
 #define EXIM_HAVE_TCPI_UNACKED
+#ifndef TCPI_OPT_SYN_DATA
+# define TCPI_OPT_SYN_DATA 32
+#endif
 
 
 /* End */
diff --git a/src/src/expand.c b/src/src/expand.c
index adc90f633..f32425b3f 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -5811,7 +5811,7 @@ while (*s != 0)
 		}
 	      if (Ustrcmp(item, sub[0]) == 0)	/*XXX should be a UTF8-compare */
 		{
-		s = item + strlen(item) + 1;
+		s = item + Ustrlen(item) + 1;
 		while (isspace(*s)) s++;
 		if (*s != ':')
 		  {
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 14bbf312a..a49d6c285 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -824,7 +824,7 @@ if (*s) for (m = *s == '_' ? macros : macros_user; m; m = m->next)
     int moveby;
 
     READCONF_DEBUG fprintf(stderr, "%s: matched '%s' in '%.*s'\n", __FUNCTION__,
-      m->name, strlen(ss)-1, ss);
+      m->name, (int) Ustrlen(ss)-1, ss);
     /* Expand the buffer if necessary */
 
     while (*newlen - m->namelen + m->replen + 1 > big_buffer_size)
diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index f02863a54..ef2c9fdeb 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -149,7 +149,6 @@ struct tcp_info tinfo;
 socklen_t len = sizeof(tinfo);
 
 if (getsockopt(sock, IPPROTO_TCP, TCP_INFO, &tinfo, &len) == 0)
-  {
   switch (tcp_out_fastopen)
     {
       /* This is a somewhat dubious detection method; totally undocumented so likely
@@ -172,7 +171,7 @@ if (getsockopt(sock, IPPROTO_TCP, TCP_INFO, &tinfo, &len) == 0)
 	}
       break;
 
-#ifdef notdef		/* This seems to always fire, meaning that we cannot tell
+#  ifdef notdef		/* This seems to always fire, meaning that we cannot tell
 			whether the server accepted data we sent.  For now assume
 			that it did. */
 
@@ -185,10 +184,10 @@ if (getsockopt(sock, IPPROTO_TCP, TCP_INFO, &tinfo, &len) == 0)
 	tcp_out_fastopen = TFO_NOT_USED;
 	}
       break;
-#endif
-    }
 
-  }
+  default: break;	/* compiler quietening */
+#  endif
+    }
 # endif
 }
 #endif
-- 
2.25.1