dovecot-2.1: lmtp: Code cleanup.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/93cba8e84546
changeset: 13583:93cba8e84546
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Oct 02 16:51:40 2011 +0300
description:
lmtp: Code cleanup.

diffstat:

 src/lmtp/client.c   |  13 ++++++++-----
 src/lmtp/client.h   |   2 --
 src/lmtp/commands.c |   7 +++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (62 lines):

diff -r 020d2092f2f7 -r 93cba8e84546 src/lmtp/client.c
--- a/src/lmtp/client.c	Sun Oct 02 16:47:25 2011 +0300
+++ b/src/lmtp/client.c	Sun Oct 02 16:51:40 2011 +0300
@@ -291,12 +291,15 @@
 			mail_storage_service_user_free(&rcpt->service_user);
 	}
 
-	if (client->state.raw_mail != NULL)
+	if (client->state.raw_mail != NULL) {
+		struct mailbox_transaction_context *raw_trans =
+			client->state.raw_mail->transaction;
+		struct mailbox *raw_box = client->state.raw_mail->box;
+
 		mail_free(&client->state.raw_mail);
-	if (client->state.raw_trans != NULL)
-		mailbox_transaction_rollback(&client->state.raw_trans);
-	if (client->state.raw_box != NULL)
-		mailbox_free(&client->state.raw_box);
+		mailbox_transaction_rollback(&raw_trans);
+		mailbox_free(&raw_box);
+	}
 
 	if (client->state.mail_data != NULL)
 		buffer_free(&client->state.mail_data);
diff -r 020d2092f2f7 -r 93cba8e84546 src/lmtp/client.h
--- a/src/lmtp/client.h	Sun Oct 02 16:47:25 2011 +0300
+++ b/src/lmtp/client.h	Sun Oct 02 16:51:40 2011 +0300
@@ -27,8 +27,6 @@
 	struct ostream *mail_data_output;
 	const char *added_headers;
 
-	struct mailbox *raw_box;
-	struct mailbox_transaction_context *raw_trans;
 	struct mail *raw_mail;
 
 	struct mail_user *dest_user;
diff -r 020d2092f2f7 -r 93cba8e84546 src/lmtp/commands.c
--- a/src/lmtp/commands.c	Sun Oct 02 16:47:25 2011 +0300
+++ b/src/lmtp/commands.c	Sun Oct 02 16:51:40 2011 +0300
@@ -626,6 +626,7 @@
 		NULL
 	};
 	struct mailbox *box;
+	struct mailbox_transaction_context *trans;
 	struct mailbox_header_lookup_ctx *headers_ctx;
 	enum mail_error error;
 
@@ -639,12 +640,10 @@
 		return -1;
 	}
 
-	client->state.raw_box = box;
-	client->state.raw_trans = mailbox_transaction_begin(box, 0);
+	trans = mailbox_transaction_begin(box, 0);
 
 	headers_ctx = mailbox_header_lookup_init(box, wanted_headers);
-	client->state.raw_mail = mail_alloc(client->state.raw_trans,
-					    0, headers_ctx);
+	client->state.raw_mail = mail_alloc(trans, 0, headers_ctx);
 	mailbox_header_lookup_unref(&headers_ctx);
 	mail_set_seq(client->state.raw_mail, 1);
 	return 0;