tidying

3 files changed, 4 insertions, 3 deletions

diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 1d87cec17..2cee43b85 100644
--- 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 210f7b0e2..a037e2edf 100644
--- 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 f0c0a3aad..ba4996f42 100644
--- 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);