tidying

diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 1d87cec1768cee626458f914155b426e83773297..2cee43b8507ad7d3dcbb13e99939535999892108 100644 (file)
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -138,6 +138,7 @@ return -1;              /* Never obeyed */
 }
 
 
+FUNC_MAYBE_UNUSED
 static void
 options(int argc, uschar * argv[], uschar * name)
 {

diff --git a/src/src/filter.c b/src/src/filter.c
index 210f7b0e2441c0119ac47d815197f6e2c84392fc..a037e2edf3ed8b0272ef044fdc7c8ceea81818e3 100644 (file)
--- a/src/src/filter.c
+++ b/src/src/filter.c
@@ -655,7 +655,7 @@ for (;;)
 
   else
     {
-    const uschar *saveptr = ptr;
+//    const uschar *saveptr = ptr;
     ptr = nextword(ptr, buffer, sizeof(buffer), FALSE);
     if (*error_pointer) break;
 

diff --git a/src/src/functions.h b/src/src/functions.h
index f0c0a3aad99418fd79bbe9b5932785801e8538db..ba4996f425d8131aef871660817c960a80845bb3 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -1264,10 +1264,10 @@ HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP%c> %s\n",
 
 #  ifndef DISABLE_CLIENT_CMD_LOG
   {
+  int len = Ustrcspn(buf, " \n");
   int old_pool = store_pool;
   store_pool = POOL_PERM;      /* Main pool ACL allocations eg. callouts get released */
-  client_cmd_log = string_append_listele_n(client_cmd_log, ':', buf,
-                                         Ustrcspn(buf, " \n"));
+  client_cmd_log = string_append_listele_n(client_cmd_log, ':', buf, MIN(len, 8));
   if (mode == SCMD_BUFFER) 
     {
     client_cmd_log = string_catn(client_cmd_log, US"|", 1);