tidying

diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index 1d24769dbf20f6b202f5f7b9966c30dd559698cb..98aebe0165024d3d9458aa15e3e4f7795528e349 100644 (file)
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -170,8 +170,7 @@ open_db *
 dbfn_open(const uschar * name, int flags, open_db * dbblock,
   BOOL lof, BOOL panic)
 {
-int rc, save_errno, dlen, flen;
-flock_t lock_data;
+int save_errno, dlen, flen;
 uschar dirname[PATHLEN], filename[PATHLEN];
 
 DEBUG(D_hints_lookup) acl_level++;
@@ -268,8 +267,7 @@ starting a transaction.  "lof" and "panic" always true; read/write mode.
 open_db *
 dbfn_open_multi(const uschar * name, int flags, open_db * dbblock)
 {
-int rc, save_errno, dlen;
-flock_t lock_data;
+int save_errno, dlen;
 uschar dirname[PATHLEN], filename[PATHLEN];
 
 DEBUG(D_hints_lookup) acl_level++;

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 19b5c81dfed1fc13b09a73eb28b3118e39e3d49a..ef2800efe6688240d307b6a3ba62b17c277c8543 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -5279,7 +5279,7 @@ do_remote_deliveries par_reduce par_wait par_read_pipe
   if (continue_transport)
     {
     par_reduce(0, fallback);
-    if (!continue_next_id && continue_wait_db)
+    if (!*continue_next_id && continue_wait_db)
        { dbfn_close_multi(continue_wait_db); continue_wait_db = NULL; }
     }
 

diff --git a/src/src/expand.c b/src/src/expand.c
index cc8b12224a7d020e2c91fea260bf0abca55f7308..b50639e4bd19869a329909c3a93286b97b304dc3 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -7346,9 +7346,6 @@ NOT_ITEM: ;
        yield = string_catn(yield, sub, t-sub);
        break;
        }
-       {
-       uschar * s = sub;
-       }
 
       case EOP_UC:
        {