tidying

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 539eeea330a4a1a2995df8a02c70426806c4ea38..63cf9babd36aa04e4b64ef747b7edc091c4703a1 100644 (file)
--- 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 adc90f63393808328ceb8db93d12fb8f75768727..f32425b3f8bc8fb959ca971f1beb8e6674be97d9 100644 (file)
--- 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 14bbf312a16fd9c159c2f49382d35b0153056cc1..a49d6c285ba456c530d143ecc9dcd6f26d3d9501 100644 (file)
--- 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 f02863a5410bda5867577a3a25190d3b8ca117c9..ef2c9fdeb37a0d07e0beb7b8026b1d7ff48c00e2 100644 (file)
--- 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