tidying

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 1b36204459ea0ddbe6963d15f6d63b75cc756088..d9b77804bd1cfcbe5876942f7ad1c53657e5f39e 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -25,8 +25,8 @@ JH/04 Add variables $arc_domains, $arc_oldest_pass for ARC verify.  Fix the
 JH/05 Bug 2273: Cutthrough delivery left a window where the received messsage
       files in the spool were present and unlocked.  A queue-runner could spot
       them, resulting in a duplicate delivery.  Fix that by doing the unlock
-      after the unlink.  Investigation by Time Stewart.  Take the opportunity to
-      add more error-checking on spoofile handling while that code is being
+      after the unlink.  Investigation by Tim Stewart.  Take the opportunity to
+      add more error-checking on spoolfile handling while that code is being
       messed with.
 
 

diff --git a/src/src/search.c b/src/src/search.c
index b1dc884c9341d715f2faebbd8deffd9d4476c7ef..8f46c7e85531b6d62cbcfdc1e910d7028dfc3a7f 100644 (file)
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -464,10 +464,10 @@ Returns:       a pointer to a dynamic string containing the answer,
 static uschar *
 internal_search_find(void *handle, uschar *filename, uschar *keystring)
 {
-tree_node *t = (tree_node *)handle;
-search_cache *c = (search_cache *)(t->data.ptr);
-expiring_data *e;
-uschar *data = NULL;
+tree_node * t = (tree_node *)handle;
+search_cache * c = (search_cache *)(t->data.ptr);
+expiring_data * e = NULL;      /* compiler quietening */
+uschar * data = NULL;
 int search_type = t->name[0] - '0';
 int old_pool = store_pool;
 

diff --git a/src/src/string.c b/src/src/string.c
index 5a8d0e76312950d819594374f3a439f3c39aa364..3abe2a3bdbd07de686ee2968f194ece565a1e296 100644 (file)
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -1059,8 +1059,6 @@ gstring *
 string_append2_listele_n(gstring * list, const uschar * sepstr,
  const uschar * ele, unsigned len)
 {
-const uschar * sp;
-
 if (list && list->ptr)
   list = string_cat(list, sepstr);