# HG changeset patch # User Timo Sirainen # Date 1486656074 -7200 # Node ID 4db73d3fb3ff92093d598370a2344d6404047bcf # Parent a79cac08f84c9979db74fd4b6863191d2bdd35c0 lib-lda: Remove unused mail_deliver_get_log_var_expand_table() diff -r a79cac08f84c -r 4db73d3fb3ff src/lib-lda/mail-deliver.c --- 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) { diff -r a79cac08f84c -r 4db73d3fb3ff src/lib-lda/mail-deliver.h --- 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);