From 8d6cb5fdac4b2bab0922fe431e12d8f7cc02d723 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 5 Feb 2022 11:03:18 +0000 Subject: [PATCH] tidying --- src/exim_monitor/em_log.c | 2 +- src/src/exim.c | 4 +-- src/src/functions.h | 1 - src/src/parse.c | 55 +++++++++++++++++++-------------------- src/src/rda.c | 4 +-- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c index a2a489c3a..d9b2a7933 100644 --- a/src/exim_monitor/em_log.c +++ b/src/exim_monitor/em_log.c @@ -292,7 +292,7 @@ if (LOG != NULL) if ((p = Ustrstr(buffer, "==")) != NULL) { queue_item *qq = find_queue(id, queue_noop, 0); - if (qq != NULL) + if (qq) { dest_item *d; uschar *q, *r; diff --git a/src/src/exim.c b/src/src/exim.c index b59157286..8fff9f6a3 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -944,7 +944,7 @@ else int rc = verify_address(deliver_make_addr(address,TRUE), stdout, flags, -1, -1, -1, NULL, NULL, NULL); if (rc == FAIL) *exit_value = 2; - else if (rc == DEFER && *exit_value == 0) *exit_value = 1; + else if (rc == DEFER && *exit_value == 0) *exit_value = 1; } } @@ -954,7 +954,7 @@ else * Show supported features * *************************************************/ -void +static void show_string(BOOL is_stdout, gstring * g) { const uschar * s = string_from_gstring(g); diff --git a/src/src/functions.h b/src/src/functions.h index 9c428120b..88e9431d1 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -478,7 +478,6 @@ extern void set_process_info(const char *, ...) PRINTF_FUNCTION(1,2); extern void sha1_end(hctx *, const uschar *, int, uschar *); extern void sha1_mid(hctx *, const uschar *); extern void sha1_start(hctx *); -extern void show_string(BOOL, gstring *); extern int sieve_interpret(uschar *, int, uschar *, uschar *, uschar *, uschar *, address_item **, uschar **); extern void sigalrm_handler(int); diff --git a/src/src/parse.c b/src/src/parse.c index edbee2646..8c1badd08 100644 --- a/src/src/parse.c +++ b/src/src/parse.c @@ -1252,18 +1252,15 @@ DEBUG(D_route) debug_printf("parse_forward_list: %s\n", s); for (;;) { - int len; - int special = 0; - int specopt = 0; - int specbit = 0; - const uschar *ss, *nexts; - address_item *addr; + int len, special = 0, specopt = 0, specbit = 0; + const uschar * ss, * nexts; + address_item * addr; BOOL inquote = FALSE; for (;;) { while (isspace(*s) || *s == ',') s++; - if (*s == '#') { while (*s != 0 && *s != '\n') s++; } else break; + if (*s == '#') { while (*s && *s != '\n') s++; } else break; } /* When we reach the end of the list, we return FF_DELIVERED if any child @@ -1287,8 +1284,8 @@ for (;;) #ifdef NEVER if (count > 0) return FF_DELIVERED; /* Something was generated */ - if (syntax_errors == NULL || /* Not skipping syntax errors, or */ - *syntax_errors == NULL) /* we didn't actually skip any */ + if (!syntax_errors || /* Not skipping syntax errors, or */ + !*syntax_errors) /* we didn't actually skip any */ return FF_NOTDELIVERED; *error = string_sprintf("no addresses generated: syntax error in %s: %s", @@ -1311,7 +1308,7 @@ for (;;) /* Remove any trailing spaces; we know there's at least one non-space. */ - while (isspace((ss[-1]))) ss--; + while (isspace(ss[-1])) ss--; /* We now have s->start and ss->end of the next address. Remove quotes if they completely enclose, remembering the address started with a quote @@ -1324,7 +1321,7 @@ for (;;) ss--; inquote = TRUE; while (s < ss && isspace(*s)) s++; - while (ss > s && isspace((ss[-1]))) ss--; + while (ss > s && isspace(ss[-1])) ss--; } /* Set up the length of the address. */ @@ -1374,14 +1371,14 @@ for (;;) if (Ustrncmp(s, ":include:", 9) == 0) { - uschar *filebuf; + uschar * filebuf; uschar filename[256]; const uschar * t = s+9; int flen = len - 9; int frc; struct stat statbuf; - address_item *last; - FILE *f; + address_item * last; + FILE * f; while (flen > 0 && isspace(*t)) { t++; flen--; } @@ -1425,7 +1422,7 @@ for (;;) if (directory) { int len = Ustrlen(directory); - uschar *p = filename + len; + uschar * p = filename + len; if (Ustrncmp(filename, directory, len) != 0 || *p != '/') { @@ -1614,16 +1611,16 @@ for (;;) is no domain, treat it as a file or pipe. If it was a quoted item, remove the quoting occurrences of \ within it. */ - if ((*s_ltd == '|' || *s_ltd == '/') && (recipient == NULL || domain == 0)) + if ((*s_ltd == '|' || *s_ltd == '/') && (!recipient || domain == 0)) { - uschar *t = store_get(Ustrlen(s_ltd) + 1, is_tainted(s_ltd)); - uschar *p = t; - uschar *q = s_ltd; - while (*q != 0) + uschar * t = store_get(Ustrlen(s_ltd) + 1, is_tainted(s_ltd)); + uschar * p = t, * q = s_ltd; + + while (*q) { if (inquote) { - *p++ = (*q == '\\')? *(++q) : *q; + *p++ = *q == '\\' ? *++q : *q; q++; } else *p++ = *q++; @@ -1654,13 +1651,15 @@ for (;;) if (syntax_errors) { - error_block *e = store_get(sizeof(error_block), FALSE); - error_block *last = *syntax_errors; - if (!last) *syntax_errors = e; else + error_block * e = store_get(sizeof(error_block), FALSE); + error_block * last = *syntax_errors; + if (last) { while (last->next) last = last->next; last->next = e; } + else + *syntax_errors = e; e->next = NULL; e->text1 = *error; e->text2 = s_ltd; @@ -1677,10 +1676,10 @@ for (;;) /* Address was successfully parsed. Rewrite, and then make an address block. */ - recipient = ((options & RDO_REWRITE) != 0)? - rewrite_address(recipient, TRUE, FALSE, global_rewrite_rules, - rewrite_existflags) : - rewrite_address_qualify(recipient, TRUE); /*XXX loses track of const */ + recipient = options & RDO_REWRITE + ? rewrite_address(recipient, TRUE, FALSE, global_rewrite_rules, + rewrite_existflags) + : rewrite_address_qualify(recipient, TRUE); /*XXX loses track of const */ addr = deliver_make_addr(US recipient, TRUE); /* TRUE => copy recipient, so deconst ok */ } diff --git a/src/src/rda.c b/src/src/rda.c index 1ab9e2f40..35794c2ff 100644 --- a/src/src/rda.c +++ b/src/src/rda.c @@ -959,8 +959,8 @@ if (had_disaster) *error = string_sprintf("internal problem in %s: failure to transfer " "data from subprocess: status=%04x%s%s%s", rname, status, readerror, - (*error == NULL)? US"" : US": error=", - (*error == NULL)? US"" : *error); + *error ? US": error=" : US"", + *error ? *error : US""); log_write(0, LOG_MAIN|LOG_PANIC, "%s", *error); } else if (status != 0) -- 2.30.2