From: Jeremy Harris Date: Sat, 27 Jul 2024 19:16:35 +0000 (+0100) Subject: tidying X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/bac7f52fec3030e8572bf23b88218faa68c8520b tidying --- diff --git a/src/src/dbfn.c b/src/src/dbfn.c index 1d24769db..98aebe016 100644 --- 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 19b5c81df..ef2800efe 100644 --- 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 cc8b12224..b50639e4b 100644 --- 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: {