From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 9 Feb 2017 16:01:14 +0000 (+0200)
Subject: lib-lda: Remove unused mail_deliver_get_log_var_expand_table()
X-Git-Tag: 2.3.0.rc1~2115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f1f92d6f32dfe2cf04fac1d42c42a52aeff335b;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: Remove unused mail_deliver_get_log_var_expand_table()
---

diff --git a/src/lib-lda/mail-deliver.c b/src/lib-lda/mail-deliver.c
index 10f7cf25ae..cce5caaabc 100644
--- a/src/lib-lda/mail-deliver.c
+++ b/src/lib-lda/mail-deliver.c
@@ -78,10 +78,8 @@ mail_deliver_get_log_var_expand_table_full(struct mail_deliver_context *ctx,
 		psize = dec2str(size);
 	if (mail_get_virtual_size(mail, &size) == 0)
 		vsize = dec2str(size);
-	if (ctx != NULL) {
-		session_time = dec2str(ctx->session_time_msecs);
-		to_envelope = ctx->dest_addr;
-	}
+	session_time = dec2str(ctx->session_time_msecs);
+	to_envelope = ctx->dest_addr;
 	(void)mail_get_special(mail, MAIL_FETCH_STORAGE_ID, &storage_id);
 
 	const struct var_expand_table stack_tab[] = {
@@ -103,17 +101,10 @@ mail_deliver_get_log_var_expand_table_full(struct mail_deliver_context *ctx,
 
 	tab = t_malloc_no0(sizeof(stack_tab));
 	memcpy(tab, stack_tab, sizeof(stack_tab));
-	if (ctx != NULL)
-		mail_deliver_log_var_expand_table_update_times(ctx, tab);
+	mail_deliver_log_var_expand_table_update_times(ctx, tab);
 	return tab;
 }
 
-const struct var_expand_table *
-mail_deliver_get_log_var_expand_table(struct mail *mail, const char *message)
-{
-	return mail_deliver_get_log_var_expand_table_full(NULL, mail, message);
-}
-
 const struct var_expand_table *
 mail_deliver_ctx_get_log_var_expand_table(struct mail_deliver_context *ctx,
 					  const char *message)
diff --git a/src/lib-lda/mail-deliver.h b/src/lib-lda/mail-deliver.h
index 08ebfe02fe..36d0f36c33 100644
--- a/src/lib-lda/mail-deliver.h
+++ b/src/lib-lda/mail-deliver.h
@@ -85,8 +85,6 @@ extern deliver_mail_func_t *deliver_mail;
 const struct var_expand_table *
 mail_deliver_ctx_get_log_var_expand_table(struct mail_deliver_context *ctx,
 					  const char *message);
-const struct var_expand_table *
-mail_deliver_get_log_var_expand_table(struct mail *mail, const char *message);
 void mail_deliver_log(struct mail_deliver_context *ctx, const char *fmt, ...)
 	ATTR_FORMAT(2, 3);