[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/0488984dcd596341bdeacee57fa1ba2940d6a951

Commit:     0488984dcd596341bdeacee57fa1ba2940d6a951
Parent:     cfbb0d24e87427488fec0315366c27cdff1fcc20
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon May 7 14:42:35 2018 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon May 7 14:42:35 2018 +0100

    tidying
---
 doc/doc-txt/ChangeLog | 4 ++--
 src/src/search.c      | 8 ++++----
 src/src/string.c      | 2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 1b36204..d9b7780 100644
--- 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 b1dc884..8f46c7e 100644
--- 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 5a8d0e7..3abe2a3 100644
--- 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);