dovecot: Call mail_alloc/mail_free, not index_mail_alloc/index_m...

dovecot at dovecot.org dovecot at dovecot.org
Thu Aug 16 17:35:49 EEST 2007


details:   http://hg.dovecot.org/dovecot/rev/a8d5d826318b
changeset: 6302:a8d5d826318b
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 16 17:35:45 2007 +0300
description:
Call mail_alloc/mail_free, not index_mail_alloc/index_mail/free directly.

diffstat:

3 files changed, 7 insertions(+), 7 deletions(-)
src/lib-storage/index/cydir/cydir-save.c     |    4 ++--
src/lib-storage/index/maildir/maildir-save.c |    6 +++---
src/lib-storage/index/mbox/mbox-save.c       |    4 ++--

diffs (71 lines):

diff -r 8bca8efebfcf -r a8d5d826318b src/lib-storage/index/cydir/cydir-save.c
--- a/src/lib-storage/index/cydir/cydir-save.c	Thu Aug 16 17:28:33 2007 +0300
+++ b/src/lib-storage/index/cydir/cydir-save.c	Thu Aug 16 17:35:45 2007 +0300
@@ -111,7 +111,7 @@ int cydir_save_init(struct mailbox_trans
 
 	if (dest_mail == NULL) {
 		if (ctx->mail == NULL)
-			ctx->mail = index_mail_alloc(_t, 0, NULL);
+			ctx->mail = mail_alloc(_t, 0, NULL);
 		dest_mail = ctx->mail;
 	}
 	mail_set_seq(dest_mail, ctx->seq);
@@ -299,7 +299,7 @@ void cydir_transaction_save_rollback(str
 		(void)cydir_sync_finish(&ctx->sync_ctx, FALSE);
 
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	i_free(ctx->tmp_basename);
 	i_free(ctx);
 }
diff -r 8bca8efebfcf -r a8d5d826318b src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c	Thu Aug 16 17:28:33 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-save.c	Thu Aug 16 17:35:45 2007 +0300
@@ -190,7 +190,7 @@ uint32_t maildir_save_add(struct maildir
 			struct mailbox_transaction_context *_t =
 				&t->ictx.mailbox_ctx;
 
-			ctx->mail = index_mail_alloc(_t, 0, NULL);
+			ctx->mail = mail_alloc(_t, 0, NULL);
 		}
 		dest_mail = ctx->mail;
 	}
@@ -708,7 +708,7 @@ void maildir_transaction_save_commit_pos
 		maildir_uidlist_get_uid_validity(ctx->mbox->uidlist);
 
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	pool_unref(ctx->pool);
 }
 
@@ -756,6 +756,6 @@ void maildir_transaction_save_rollback(s
 	t_pop();
 
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	pool_unref(ctx->pool);
 }
diff -r 8bca8efebfcf -r a8d5d826318b src/lib-storage/index/mbox/mbox-save.c
--- a/src/lib-storage/index/mbox/mbox-save.c	Thu Aug 16 17:28:33 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-save.c	Thu Aug 16 17:35:45 2007 +0300
@@ -450,7 +450,7 @@ int mbox_save_init(struct mailbox_transa
 		/* parse and cache the mail headers as we read it */
 		if (dest_mail == NULL) {
 			if (ctx->mail == NULL)
-				ctx->mail = index_mail_alloc(_t, 0, NULL);
+				ctx->mail = mail_alloc(_t, 0, NULL);
 			dest_mail = ctx->mail;
 		}
 		mail_set_seq(dest_mail, ctx->seq);
@@ -643,7 +643,7 @@ static void mbox_transaction_save_deinit
 	if (ctx->output != NULL)
 		o_stream_destroy(&ctx->output);
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	str_free(&ctx->headers);
 	i_free(ctx);
 }


More information about the dovecot-cvs mailing list