changeset 21554:7a2f1c800c8c

lib-lda: Code cleanup - remove unnecessary dest_mail check
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Tue, 14 Feb 2017 20:23:16 +0200
parents 4a2884480ddc
children 056e0eaaaa2e
files src/lib-lda/mail-deliver.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-lda/mail-deliver.c	Tue Feb 14 20:20:07 2017 +0200
+++ b/src/lib-lda/mail-deliver.c	Tue Feb 14 20:23:16 2017 +0200
@@ -114,11 +114,11 @@
 mail_deliver_ctx_get_log_var_expand_table(struct mail_deliver_context *ctx,
 					  const char *message)
 {
-	struct mail *mail = ctx->dest_mail != NULL ?
-		ctx->dest_mail : ctx->src_mail;
 	unsigned int delivery_time_msecs;
 
-	mail_deliver_log_update_cache(ctx, mail);
+	/* If a mail was saved/copied, the cache is already filled and the
+	   following call is ignored. Otherwise, only the source mail exists. */
+	mail_deliver_log_update_cache(ctx, ctx->src_mail);
 	/* This call finishes a mail delivery. With Sieve there may be multiple
 	   mail deliveries. */
 	ctx->cache->filled = FALSE;