diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-06-12 17:19:09 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-06-14 20:57:00 +0100 |
| commit | 0ba0ee973ddbf1766845642873e668b1a1fdc8a3 (patch) | |
| tree | ca3261c9c65cfee395e6b6b9ba1ed75f133f5eeb | |
| parent | baf5730b704991a1c5f22770b6220f07b9a855f4 (diff) | |
minor tidying
| -rw-r--r-- | src/src/deliver.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index 40e13ee24..2ee71f502 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -4815,15 +4815,12 @@ print_address_error(address_item *addr, FILE *f, uschar *t) int count = Ustrlen(t); uschar *s = testflag(addr, af_pass_message)? addr->message : NULL; -if (s == NULL) - { - if (addr->user_message != NULL) s = addr->user_message; else return; - } +if (!s && !(s = addr->user_message)) + return; fprintf(f, "\n %s", t); -while (*s != 0) - { +while (*s) if (*s == '\\' && s[1] == 'n') { fprintf(f, "\n "); @@ -4840,7 +4837,6 @@ while (*s != 0) count = 0; } } - } } @@ -4866,7 +4862,6 @@ Returns: nothing static void print_dsn_diagnostic_code(const address_item *addr, FILE *f) { - uschar *s = testflag(addr, af_pass_message) ? addr->message : NULL; /* af_pass_message and addr->message set ? print remote host answer */ |