Mercurial > dovecot > core-2.2

changeset 8955:4d4e1cbb61a0 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed rarely used parameters from mail_index_transaction_commit(). mail_index_transaction_commit_get_pos() can be used where they're required.
author Timo Sirainen <tss@iki.fi>
date Wed, 11 Mar 2009 18:42:13 -0400
parents fb90b6e3b4b7
children ec6428000c5b
files src/lib-index/mail-cache-transaction.c src/lib-index/mail-index-modseq.c src/lib-index/mail-index-sync.c src/lib-index/mail-index-transaction.c src/lib-index/mail-index.h src/lib-storage/index/dbox/dbox-map.c src/lib-storage/index/dbox/dbox-sync-rebuild.c src/lib-storage/index/index-transaction.c src/lib-storage/list/index-mailbox-list-sync.c
diffstat 9 files changed, 26 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-cache-transaction.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-index/mail-cache-transaction.c	Wed Mar 11 18:42:13 2009 -0400
@@ -116,8 +116,6 @@
 	struct mail_cache *cache = ctx->cache;
 	struct mail_index_view *view;
 	struct mail_index_transaction *trans;
-	uint32_t log_file_seq;
-	uoff_t log_file_offset;
 	int ret;
 
 	ctx->tried_compression = TRUE;
@@ -132,8 +130,7 @@
 		mail_index_transaction_rollback(&trans);
 		ret = -1;
 	} else {
-		ret = mail_index_transaction_commit(&trans, &log_file_seq,
-						    &log_file_offset);
+		ret = mail_index_transaction_commit(&trans);
 	}
 	mail_index_view_close(&view);
 	mail_cache_transaction_reset(ctx);
--- a/src/lib-index/mail-index-modseq.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-index/mail-index-modseq.c	Wed Mar 11 18:42:13 2009 -0400
@@ -57,8 +57,7 @@
 	struct mail_index_transaction *trans;
 	struct mail_index_view *view;
 	struct mail_index_modseq_header hdr;
-	uint32_t ext_map_idx, log_seq;
-	uoff_t log_offset;
+	uint32_t ext_map_idx;
 
 	if (index->modseqs_enabled)
 		return;
@@ -75,8 +74,7 @@
 					     0, &hdr, sizeof(hdr));
 
 		/* commit also refreshes the index, which syncs the modseqs */
-		(void)mail_index_transaction_commit(&trans,
-						    &log_seq, &log_offset);
+		(void)mail_index_transaction_commit(&trans);
 		mail_index_view_close(&view);
 
 		/* get the modseq extension to index map */
--- a/src/lib-index/mail-index-sync.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-index/mail-index-sync.c	Wed Mar 11 18:42:13 2009 -0400
@@ -723,8 +723,7 @@
 {
         struct mail_index_sync_ctx *ctx = *_ctx;
 	struct mail_index *index = ctx->index;
-	uint32_t seq, next_uid;
-	uoff_t offset;
+	uint32_t next_uid;
 	bool want_rotate;
 	int ret = 0;
 
@@ -746,7 +745,7 @@
 		}
 	}
 
-	if (mail_index_transaction_commit(&ctx->ext_trans, &seq, &offset) < 0) {
+	if (mail_index_transaction_commit(&ctx->ext_trans) < 0) {
 		mail_index_sync_end(&ctx);
 		return -1;
 	}
--- a/src/lib-index/mail-index-transaction.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-index/mail-index-transaction.c	Wed Mar 11 18:42:13 2009 -0400
@@ -622,9 +622,17 @@
         mail_index_transaction_unref(&t);
 }
 
-int mail_index_transaction_commit(struct mail_index_transaction **_t,
-				  uint32_t *log_file_seq_r,
-				  uoff_t *log_file_offset_r)
+int mail_index_transaction_commit(struct mail_index_transaction **t)
+{
+	uint32_t log_seq;
+	uoff_t log_offset;
+
+	return mail_index_transaction_commit_get_pos(t, &log_seq, &log_offset);
+}
+
+int mail_index_transaction_commit_get_pos(struct mail_index_transaction **_t,
+					  uint32_t *log_file_seq_r,
+					  uoff_t *log_file_offset_r)
 {
 	struct mail_index_transaction *t = *_t;
 
--- a/src/lib-index/mail-index.h	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-index/mail-index.h	Wed Mar 11 18:42:13 2009 -0400
@@ -229,9 +229,10 @@
 struct mail_index_transaction *
 mail_index_transaction_begin(struct mail_index_view *view,
 			     enum mail_index_transaction_flags flags);
-int mail_index_transaction_commit(struct mail_index_transaction **t,
-				  uint32_t *log_file_seq_r,
-				  uoff_t *log_file_offset_r);
+int mail_index_transaction_commit(struct mail_index_transaction **t);
+int mail_index_transaction_commit_get_pos(struct mail_index_transaction **t,
+					  uint32_t *log_file_seq_r,
+					  uoff_t *log_file_offset_r);
 void mail_index_transaction_rollback(struct mail_index_transaction **t);
 /* Discard all changes in the transaction. */
 void mail_index_transaction_reset(struct mail_index_transaction *t);
--- a/src/lib-storage/index/dbox/dbox-map.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-map.c	Wed Mar 11 18:42:13 2009 -0400
@@ -305,11 +305,7 @@
 		mail_index_transaction_rollback(&trans);
 		return -1;
 	} else {
-		uint32_t log_seq;
-		uoff_t log_offset;
-
-		if (mail_index_transaction_commit(&trans, &log_seq,
-						  &log_offset) < 0) {
+		if (mail_index_transaction_commit(&trans) < 0) {
 			mail_storage_set_internal_error(&map->storage->storage);
 			mail_index_reset_error(map->index);
 			return -1;
@@ -326,8 +322,6 @@
 	const void *data;
 	bool expunged;
 	uint32_t seq;
-	uint32_t log_seq;
-	uoff_t log_offset;
 
 	/* make sure the map is refreshed, otherwise we might be expunging
 	   messages that have already been moved to other files. */
@@ -347,7 +341,7 @@
 		if (rec->file_id == file_id)
 			mail_index_expunge(trans, seq);
 	}
-	if (mail_index_transaction_commit(&trans, &log_seq, &log_offset) < 0) {
+	if (mail_index_transaction_commit(&trans) < 0) {
 		mail_storage_set_internal_error(&map->storage->storage);
 		mail_index_reset_error(map->index);
 		return -1;
--- a/src/lib-storage/index/dbox/dbox-sync-rebuild.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-sync-rebuild.c	Wed Mar 11 18:42:13 2009 -0400
@@ -412,8 +412,6 @@
 int dbox_sync_index_rebuild(struct dbox_mailbox *mbox)
 {
 	struct dbox_sync_rebuild_context ctx;
-	uint32_t seq;
-	uoff_t offset;
 	int ret;
 
 	memset(&ctx, 0, sizeof(ctx));
@@ -428,7 +426,7 @@
 	if ((ret = dbox_sync_index_rebuild_ctx(&ctx)) < 0)
 		mail_index_transaction_rollback(&ctx.trans);
 	else
-		ret = mail_index_transaction_commit(&ctx.trans, &seq, &offset);
+		ret = mail_index_transaction_commit(&ctx.trans);
 	mail_index_view_close(&ctx.view);
 
 	if (ctx.maildir_sync_ctx != NULL) {
--- a/src/lib-storage/index/index-transaction.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-storage/index/index-transaction.c	Wed Mar 11 18:42:13 2009 -0400
@@ -95,8 +95,6 @@
 	struct index_transaction_context *t =
 		(struct index_transaction_context *)_t;
 	struct mail_index_transaction *itrans = t->trans;
-	uint32_t seq;
-	uoff_t offset;
 
 	*uid_validity_r = 0;
 	*first_saved_uid_r = *last_saved_uid_r = 0;
@@ -105,7 +103,7 @@
 	t->first_saved_uid = first_saved_uid_r;
 	t->last_saved_uid = last_saved_uid_r;
 
-	return mail_index_transaction_commit(&itrans, &seq, &offset);
+	return mail_index_transaction_commit(&itrans);
 }
 
 void index_transaction_rollback(struct mailbox_transaction_context *_t)
--- a/src/lib-storage/list/index-mailbox-list-sync.c	Wed Mar 11 18:20:13 2009 -0400
+++ b/src/lib-storage/list/index-mailbox-list-sync.c	Wed Mar 11 18:42:13 2009 -0400
@@ -258,8 +258,8 @@
 		return -1;
 	}
 
-	return mail_index_transaction_commit(&trans, &ibox->log_seq,
-					     &ibox->log_offset);
+	return mail_index_transaction_commit_get_pos(&trans, &ibox->log_seq,
+						     &ibox->log_offset);
 }
 
 static struct mailbox_sync_context *