Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6512:1a3604c8ee05 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mailbox_transaction_commit*() doesn't sync the mailbox anymore, so it shouldn't take mailbox_sync_flags parameter either.
author Timo Sirainen <tss@iki.fi>
date Sun, 30 Sep 2007 17:03:26 +0300
parents fe5c19ffc119
children 0a157f89fb52
files src/deliver/deliver.c src/imap/cmd-append.c src/imap/cmd-copy.c src/imap/cmd-search.c src/imap/cmd-store.c src/imap/imap-expunge.c src/imap/imap-fetch.c src/imap/imap-sort.c src/imap/imap-sync.c src/imap/imap-thread.c src/lib-storage/index/index-storage.h src/lib-storage/index/index-transaction.c src/lib-storage/mail-storage-private.h src/lib-storage/mail-storage.c src/lib-storage/mail-storage.h src/plugins/acl/acl-mailbox.c src/plugins/convert/convert-storage.c src/plugins/expire/expire-plugin.c src/plugins/expire/expire-tool.c src/plugins/fts/fts-storage.c src/plugins/lazy-expunge/lazy-expunge-plugin.c src/plugins/mail-log/mail-log-plugin.c src/plugins/mbox-snarf/mbox-snarf-plugin.c src/plugins/quota/quota-count.c src/plugins/quota/quota-storage.c src/plugins/trash/trash-plugin.c src/pop3/client.c src/pop3/commands.c
diffstat 28 files changed, 37 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/src/deliver/deliver.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/deliver/deliver.c	Sun Sep 30 17:03:26 2007 +0300
@@ -152,7 +152,7 @@
 	if (ret < 0)
 		mailbox_transaction_rollback(&t);
 	else
-		ret = mailbox_transaction_commit(&t, 0);
+		ret = mailbox_transaction_commit(&t);
 
 	if (mail_get_first_header(mail, "Message-ID", &msgid) <= 0)
 		msgid = "";
--- a/src/imap/cmd-append.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/cmd-append.c	Sun Sep 30 17:03:26 2007 +0300
@@ -248,7 +248,7 @@
 			return TRUE;
 		}
 
-		ret = mailbox_transaction_commit_get_uids(&ctx->t, 0,
+		ret = mailbox_transaction_commit_get_uids(&ctx->t,
 							  &uid_validity,
 							  &uid1, &uid2);
 		if (ret < 0) {
--- a/src/imap/cmd-copy.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/cmd-copy.c	Sun Sep 30 17:03:26 2007 +0300
@@ -76,7 +76,7 @@
 	if (mailbox_search_deinit(&search_ctx) < 0)
 		ret = -1;
 
-	if (mailbox_transaction_commit(&src_trans, 0) < 0)
+	if (mailbox_transaction_commit(&src_trans) < 0)
 		ret = -1;
 
 	*src_uidset_r = str_c(src_uidset);
@@ -138,7 +138,7 @@
 
 	if (ret <= 0)
 		mailbox_transaction_rollback(&t);
-	else if (mailbox_transaction_commit_get_uids(&t, 0, &uid_validity,
+	else if (mailbox_transaction_commit_get_uids(&t, &uid_validity,
 						     &uid1, &uid2) < 0)
 		ret = -1;
 	else if (copy_count == 0)
--- a/src/imap/cmd-search.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/cmd-search.c	Sun Sep 30 17:03:26 2007 +0300
@@ -43,7 +43,7 @@
 	mail_free(&ctx->mail);
 	ret = mailbox_search_deinit(&ctx->search_ctx);
 
-	if (mailbox_transaction_commit(&ctx->trans, 0) < 0)
+	if (mailbox_transaction_commit(&ctx->trans) < 0)
 		ret = -1;
 
 	if (ctx->output_sent || (ret == 0 && !cmd->cancel)) {
--- a/src/imap/cmd-store.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/cmd-store.c	Sun Sep 30 17:03:26 2007 +0300
@@ -114,7 +114,7 @@
 		failed = TRUE;
 		mailbox_transaction_rollback(&t);
 	} else {
-		failed = mailbox_transaction_commit(&t, 0) < 0;
+		failed = mailbox_transaction_commit(&t) < 0;
 	}
 
 	if (!failed) {
--- a/src/imap/imap-expunge.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/imap-expunge.c	Sun Sep 30 17:03:26 2007 +0300
@@ -11,7 +11,6 @@
         struct mailbox_transaction_context *t;
 	struct mail *mail;
 	struct mail_search_arg search_arg;
-        enum mailbox_sync_flags flags;
 	bool failed;
 
 	if (mailbox_is_readonly(box)) {
@@ -35,9 +34,7 @@
 		failed = TRUE;
 		mailbox_transaction_rollback(&t);
 	} else {
-		flags = MAILBOX_SYNC_FLAG_FULL_READ |
-			MAILBOX_SYNC_FLAG_FULL_WRITE;
-		failed = mailbox_transaction_commit(&t, flags) < 0;
+		failed = mailbox_transaction_commit(&t) < 0;
 	}
 
 	return !failed;
--- a/src/imap/imap-fetch.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/imap-fetch.c	Sun Sep 30 17:03:26 2007 +0300
@@ -391,7 +391,7 @@
 		/* even if something failed, we want to commit changes to
 		   cache, as well as possible \Seen flag changes for FETCH
 		   replies we returned so far. */
-		if (mailbox_transaction_commit(&ctx->trans, 0) < 0)
+		if (mailbox_transaction_commit(&ctx->trans) < 0)
 			ctx->failed = TRUE;
 	}
 	return ctx->failed ? -1 : 0;
--- a/src/imap/imap-sort.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/imap-sort.c	Sun Sep 30 17:03:26 2007 +0300
@@ -100,7 +100,7 @@
 	ret = mailbox_search_deinit(&search_ctx);
 	mail_free(&mail);
 
-	if (mailbox_transaction_commit(&t, 0) < 0)
+	if (mailbox_transaction_commit(&t) < 0)
 		ret = -1;
 
 	if (written || ret == 0) {
--- a/src/imap/imap-sync.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/imap-sync.c	Sun Sep 30 17:03:26 2007 +0300
@@ -71,7 +71,7 @@
 		return -1;
 	}
 
-	ret = mailbox_transaction_commit(&ctx->t, 0);
+	ret = mailbox_transaction_commit(&ctx->t);
 
 	t_push();
 
--- a/src/imap/imap-thread.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/imap/imap-thread.c	Sun Sep 30 17:03:26 2007 +0300
@@ -149,7 +149,7 @@
 	o_stream_send_str(client->output, "\r\n");
 
 	ret = mailbox_search_deinit(&ctx->search_ctx);
-	if (mailbox_transaction_commit(&ctx->t, 0) < 0)
+	if (mailbox_transaction_commit(&ctx->t) < 0)
 		ret = -1;
 
 	mailbox_header_lookup_deinit(&headers_ctx);
--- a/src/lib-storage/index/index-storage.h	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/lib-storage/index/index-storage.h	Sun Sep 30 17:03:26 2007 +0300
@@ -73,7 +73,6 @@
 
 	struct index_mailbox *ibox;
 	enum mailbox_transaction_flags flags;
-	enum mailbox_sync_flags commit_flags;
 
 	struct mail_index_transaction *trans;
 	struct mail_index_view *trans_view;
@@ -169,7 +168,6 @@
 index_transaction_begin(struct mailbox *box,
 			enum mailbox_transaction_flags flags);
 int index_transaction_commit(struct mailbox_transaction_context *t,
-			     enum mailbox_sync_flags flags,
 			     uint32_t *uid_validity_r,
 			     uint32_t *first_saved_uid_r,
 			     uint32_t *last_saved_uid_r);
--- a/src/lib-storage/index/index-transaction.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/lib-storage/index/index-transaction.c	Sun Sep 30 17:03:26 2007 +0300
@@ -81,7 +81,6 @@
 }
 
 int index_transaction_commit(struct mailbox_transaction_context *_t,
-			     enum mailbox_sync_flags flags,
 			     uint32_t *uid_validity_r,
 			     uint32_t *first_saved_uid_r,
 			     uint32_t *last_saved_uid_r)
@@ -95,7 +94,6 @@
 	*uid_validity_r = 0;
 	*first_saved_uid_r = *last_saved_uid_r = 0;
 
-	t->commit_flags = flags;
 	t->saved_uid_validity = uid_validity_r;
 	t->first_saved_uid = first_saved_uid_r;
 	t->last_saved_uid = last_saved_uid_r;
--- a/src/lib-storage/mail-storage-private.h	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/lib-storage/mail-storage-private.h	Sun Sep 30 17:03:26 2007 +0300
@@ -111,7 +111,6 @@
 		(*transaction_begin)(struct mailbox *box,
 				     enum mailbox_transaction_flags flags);
 	int (*transaction_commit)(struct mailbox_transaction_context *t,
-				  enum mailbox_sync_flags flags,
 				  uint32_t *uid_validity_r,
 				  uint32_t *first_saved_uid_r,
 				  uint32_t *last_saved_uid_r);
--- a/src/lib-storage/mail-storage.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/lib-storage/mail-storage.c	Sun Sep 30 17:03:26 2007 +0300
@@ -648,16 +648,14 @@
 	return box->v.transaction_begin(box, flags);
 }
 
-int mailbox_transaction_commit(struct mailbox_transaction_context **t,
-			       enum mailbox_sync_flags flags)
+int mailbox_transaction_commit(struct mailbox_transaction_context **t)
 {
 	uint32_t tmp;
 
-	return mailbox_transaction_commit_get_uids(t, flags, &tmp, &tmp, &tmp);
+	return mailbox_transaction_commit_get_uids(t, &tmp, &tmp, &tmp);
 }
 
 int mailbox_transaction_commit_get_uids(struct mailbox_transaction_context **_t,
-					enum mailbox_sync_flags flags,
 					uint32_t *uid_validity_r,
 					uint32_t *first_saved_uid_r,
 					uint32_t *last_saved_uid_r)
@@ -667,7 +665,7 @@
 	t->box->transaction_count--;
 
 	*_t = NULL;
-	return t->box->v.transaction_commit(t, flags, uid_validity_r,
+	return t->box->v.transaction_commit(t, uid_validity_r,
 					    first_saved_uid_r,
 					    last_saved_uid_r);
 }
--- a/src/lib-storage/mail-storage.h	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/lib-storage/mail-storage.h	Sun Sep 30 17:03:26 2007 +0300
@@ -316,11 +316,9 @@
 struct mailbox_transaction_context *
 mailbox_transaction_begin(struct mailbox *box,
 			  enum mailbox_transaction_flags flags);
-int mailbox_transaction_commit(struct mailbox_transaction_context **t,
-			       enum mailbox_sync_flags flags);
+int mailbox_transaction_commit(struct mailbox_transaction_context **t);
 /* If no messages were saved/copied, first/last_saved_uid_r are 0. */
 int mailbox_transaction_commit_get_uids(struct mailbox_transaction_context **t,
-					enum mailbox_sync_flags flags,
 					uint32_t *uid_validity_r,
 					uint32_t *first_saved_uid_r,
 					uint32_t *last_saved_uid_r);
--- a/src/plugins/acl/acl-mailbox.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/acl/acl-mailbox.c	Sun Sep 30 17:03:26 2007 +0300
@@ -280,7 +280,7 @@
 
 static int
 acl_transaction_commit(struct mailbox_transaction_context *ctx,
-		       enum mailbox_sync_flags flags, uint32_t *uid_validity_r,
+		       uint32_t *uid_validity_r,
 		       uint32_t *first_saved_uid_r, uint32_t *last_saved_uid_r)
 {
 	struct acl_mailbox *abox = ACL_CONTEXT(ctx->box);
@@ -292,7 +292,7 @@
 	}
 
 	return abox->module_ctx.super.
-		transaction_commit(ctx, flags, uid_validity_r,
+		transaction_commit(ctx, uid_validity_r,
 				   first_saved_uid_r, last_saved_uid_r);
 }
 struct mailbox *acl_mailbox_open_box(struct mailbox *box)
--- a/src/plugins/convert/convert-storage.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/convert/convert-storage.c	Sun Sep 30 17:03:26 2007 +0300
@@ -77,14 +77,14 @@
 	if (ret < 0)
 		mailbox_transaction_rollback(&dest_trans);
 	else
-		ret = mailbox_transaction_commit(&dest_trans, 0);
+		ret = mailbox_transaction_commit(&dest_trans);
 
 	/* source transaction committing isn't all that important.
 	   ignore if it fails. */
 	if (ret < 0)
 		mailbox_transaction_rollback(&src_trans);
 	else
-		(void)mailbox_transaction_commit(&src_trans, 0);
+		(void)mailbox_transaction_commit(&src_trans);
 	return ret;
 }
 
--- a/src/plugins/expire/expire-plugin.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/expire/expire-plugin.c	Sun Sep 30 17:03:26 2007 +0300
@@ -89,7 +89,6 @@
 
 static int
 expire_mailbox_transaction_commit(struct mailbox_transaction_context *t,
-				  enum mailbox_sync_flags flags,
 				  uint32_t *uid_validity_r,
 				  uint32_t *first_saved_uid_r,
 				  uint32_t *last_saved_uid_r)
@@ -122,7 +121,7 @@
 	i_free(xt);
 
 	if (xpr_box->module_ctx.super.
-	    	transaction_commit(t, flags, uid_validity_r,
+	    	transaction_commit(t, uid_validity_r,
 				   first_saved_uid_r, last_saved_uid_r) < 0) {
 		t_pop();
 		return -1;
--- a/src/plugins/expire/expire-tool.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/expire/expire-tool.c	Sun Sep 30 17:03:26 2007 +0300
@@ -109,8 +109,7 @@
 
 	if (mailbox_search_deinit(&search_ctx) < 0)
 		ret = -1;
-	if (mailbox_transaction_commit(&t, MAILBOX_SYNC_FLAG_FULL_READ |
-				       MAILBOX_SYNC_FLAG_FULL_WRITE) < 0)
+	if (mailbox_transaction_commit(&t) < 0)
 		ret = -1;
 	mailbox_close(&box);
 	return ret < 0 ? -1 : 0;
--- a/src/plugins/fts/fts-storage.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/fts/fts-storage.c	Sun Sep 30 17:03:26 2007 +0300
@@ -794,7 +794,6 @@
 }
 
 static int fts_transaction_commit(struct mailbox_transaction_context *t,
-				  enum mailbox_sync_flags flags,
 				  uint32_t *uid_validity_r,
 				  uint32_t *first_saved_uid_r,
 				  uint32_t *last_saved_uid_r)
@@ -804,7 +803,7 @@
 	struct fts_transaction_context *ft = FTS_CONTEXT(t);
 	int ret;
 
-	ret = fbox->module_ctx.super.transaction_commit(t, flags,
+	ret = fbox->module_ctx.super.transaction_commit(t,
 							uid_validity_r,
 							first_saved_uid_r,
 							last_saved_uid_r);
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Sun Sep 30 17:03:26 2007 +0300
@@ -195,7 +195,7 @@
 			mail_index_expunge(itrans->trans, seq);
 	}
 
-	if (mailbox_transaction_commit(&trans, 0) < 0)
+	if (mailbox_transaction_commit(&trans) < 0)
 		ret = -1;
 
 	str_free(&ctx.path);
@@ -213,7 +213,6 @@
 
 static int
 lazy_expunge_transaction_commit(struct mailbox_transaction_context *ctx,
-				enum mailbox_sync_flags flags,
 				uint32_t *uid_validity_r,
 				uint32_t *first_saved_uid_r,
 				uint32_t *last_saved_uid_r)
@@ -227,7 +226,7 @@
 		mbox->super.transaction_rollback(ctx);
 		ret = -1;
 	} else {
-		ret = mbox->super.transaction_commit(ctx, flags, uid_validity_r,
+		ret = mbox->super.transaction_commit(ctx, uid_validity_r,
 						     first_saved_uid_r,
 						     last_saved_uid_r);
 	}
--- a/src/plugins/mail-log/mail-log-plugin.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/mail-log/mail-log-plugin.c	Sun Sep 30 17:03:26 2007 +0300
@@ -398,7 +398,6 @@
 
 static int
 mail_log_transaction_commit(struct mailbox_transaction_context *t,
-			    enum mailbox_sync_flags flags,
 			    uint32_t *uid_validity_r,
 			    uint32_t *first_saved_uid_r,
 			    uint32_t *last_saved_uid_r)
@@ -412,7 +411,7 @@
 		pool_unref(&lt->pool);
 	}
 
-	return lbox->super.transaction_commit(t, flags, uid_validity_r,
+	return lbox->super.transaction_commit(t, uid_validity_r,
 					      first_saved_uid_r,
 					      last_saved_uid_r);
 }
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sun Sep 30 17:03:26 2007 +0300
@@ -78,13 +78,13 @@
 	   mailbox, we're left with duplicates. */
 	if (ret < 0)
 		mailbox_transaction_rollback(&dest_trans);
-	else if (mailbox_transaction_commit(&dest_trans, 0) < 0)
+	else if (mailbox_transaction_commit(&dest_trans) < 0)
 		ret = -1;
 
 	if (ret < 0)
 		mailbox_transaction_rollback(&src_trans);
 	else {
-		if (mailbox_transaction_commit(&src_trans, 0) < 0)
+		if (mailbox_transaction_commit(&src_trans) < 0)
 			ret = -1;
 	}
 	return ret;
--- a/src/plugins/quota/quota-count.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/quota/quota-count.c	Sun Sep 30 17:03:26 2007 +0300
@@ -45,7 +45,7 @@
 	if (ret < 0)
 		mailbox_transaction_rollback(&trans);
 	else
-		(void)mailbox_transaction_commit(&trans, 0);
+		(void)mailbox_transaction_commit(&trans);
 
 	mailbox_close(&box);
 	return ret;
--- a/src/plugins/quota/quota-storage.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/quota/quota-storage.c	Sun Sep 30 17:03:26 2007 +0300
@@ -82,7 +82,6 @@
 
 static int
 quota_mailbox_transaction_commit(struct mailbox_transaction_context *ctx,
-				 enum mailbox_sync_flags flags,
 				 uint32_t *uid_validity_r,
 				 uint32_t *first_saved_uid_r,
 				 uint32_t *last_saved_uid_r)
@@ -90,7 +89,7 @@
 	struct quota_mailbox *qbox = QUOTA_CONTEXT(ctx->box);
 	struct quota_transaction_context *qt = QUOTA_CONTEXT(ctx);
 
-	if (qbox->module_ctx.super.transaction_commit(ctx, flags,
+	if (qbox->module_ctx.super.transaction_commit(ctx,
 						      uid_validity_r,
 						      first_saved_uid_r,
 						      last_saved_uid_r) < 0) {
@@ -424,7 +423,7 @@
 	if (ret < 0)
 		mailbox_transaction_rollback(&t);
 	else
-		ret = mailbox_transaction_commit(&t, 0);
+		ret = mailbox_transaction_commit(&t);
 	mailbox_close(&box);
 	/* FIXME: here's an unfortunate race condition */
 	return ret < 0 ? -1 :
--- a/src/plugins/trash/trash-plugin.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/plugins/trash/trash-plugin.c	Sun Sep 30 17:03:26 2007 +0300
@@ -165,10 +165,9 @@
 		mail_free(&trash->mail);
 		(void)mailbox_search_deinit(&trash->search_ctx);
 
-		if (size_expunged >= size_needed) {
-			(void)mailbox_transaction_commit(&trash->trans,
-				MAILBOX_SYNC_FLAG_FULL_WRITE);
-		} else {
+		if (size_expunged >= size_needed)
+			(void)mailbox_transaction_commit(&trash->trans);
+		else {
 			/* couldn't get enough space, don't expunge anything */
                         mailbox_transaction_rollback(&trash->trans);
 		}
--- a/src/pop3/client.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/pop3/client.c	Sun Sep 30 17:03:26 2007 +0300
@@ -99,7 +99,7 @@
 		mail_free(&mail);
 		if (mailbox_search_deinit(&ctx) < 0 || (failed && !expunged)) {
 			client_send_storage_error(client);
-			(void)mailbox_transaction_commit(&t, 0);
+			(void)mailbox_transaction_commit(&t);
 			break;
 		}
 
@@ -112,7 +112,7 @@
 
 		/* well, sync and try again. we might have cached virtual
 		   sizes, make sure they get committed. */
-		(void)mailbox_transaction_commit(&t, 0);
+		(void)mailbox_transaction_commit(&t);
 	}
 
 	if (expunged) {
@@ -249,7 +249,7 @@
 		/* client didn't QUIT, but we still want to save any changes
 		   done in this transaction. especially the cached virtual
 		   message sizes. */
-		(void)mailbox_transaction_commit(&client->trans, 0);
+		(void)mailbox_transaction_commit(&client->trans);
 	}
 	if (client->mailbox != NULL)
 		mailbox_close(&client->mailbox);
--- a/src/pop3/commands.c	Sun Sep 30 16:57:32 2007 +0300
+++ b/src/pop3/commands.c	Sun Sep 30 17:03:26 2007 +0300
@@ -231,8 +231,7 @@
 		}
 	}
 
-	if (mailbox_transaction_commit(&client->trans,
-				       MAILBOX_SYNC_FLAG_FULL_WRITE) < 0) {
+	if (mailbox_transaction_commit(&client->trans) < 0) {
 		client_send_storage_error(client);
 		client_disconnect(client, "Storage error during logout.");
 		return 1;