Mercurial > dovecot > core-2.2

changeset 21546:4db73d3fb3ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-lda: Remove unused mail_deliver_get_log_var_expand_table()
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 09 Feb 2017 18:01:14 +0200
parents a79cac08f84c
children b8d061c8ff00
files src/lib-lda/mail-deliver.c src/lib-lda/mail-deliver.h
diffstat 2 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-lda/mail-deliver.c	Fri Feb 17 11:17:00 2017 +0200
+++ b/src/lib-lda/mail-deliver.c	Thu Feb 09 18:01:14 2017 +0200
@@ -78,10 +78,8 @@
 		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,18 +101,11 @@
 
 	tab = t_malloc(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)
 {
--- a/src/lib-lda/mail-deliver.h	Fri Feb 17 11:17:00 2017 +0200
+++ b/src/lib-lda/mail-deliver.h	Thu Feb 09 18:01:14 2017 +0200
@@ -85,8 +85,6 @@
 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);