From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 20 Jan 2021 15:34:01 +0000 (+0200)
Subject: lib-index: Remove mail_index_view.transactions and related functions
X-Git-Tag: 2.3.16~299
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=920b0ad02529f56a8361d1145b3c1d9a99c4bc1c;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: Remove mail_index_view.transactions and related functions

It's enough to have transaction_list, nothing needs the count.
---

diff --git a/src/lib-index/mail-index-private.h b/src/lib-index/mail-index-private.h
index b08db905dc..5b4b94833c 100644
--- a/src/lib-index/mail-index-private.h
+++ b/src/lib-index/mail-index-private.h
@@ -334,9 +334,6 @@ int mail_index_map_ext_hdr_check(const struct mail_index_header *hdr,
 				 const char *name, const char **error_r);
 unsigned int mail_index_map_ext_hdr_offset(unsigned int name_len);
 
-void mail_index_view_transaction_ref(struct mail_index_view *view);
-void mail_index_view_transaction_unref(struct mail_index_view *view);
-
 void mail_index_fsck_locked(struct mail_index *index);
 
 /* Log an error and set it as the index's current error that is available
diff --git a/src/lib-index/mail-index-transaction.c b/src/lib-index/mail-index-transaction.c
index bd19ec381c..0ae6c20791 100644
--- a/src/lib-index/mail-index-transaction.c
+++ b/src/lib-index/mail-index-transaction.c
@@ -80,7 +80,6 @@ void mail_index_transaction_unref(struct mail_index_transaction **_t)
 
 	DLLIST_REMOVE(&t->view->transactions_list, t);
 	array_free(&t->module_contexts);
-	mail_index_view_transaction_unref(t->view);
 	if (t->latest_view != NULL)
 		mail_index_view_close(&t->latest_view);
 	mail_index_view_close(&t->view);
@@ -333,7 +332,6 @@ mail_index_transaction_begin(struct mail_index_view *view,
 	struct mail_index_transaction *t;
 
 	/* don't allow syncing view while there's ongoing transactions */
-	mail_index_view_transaction_ref(view);
  	mail_index_view_ref(view);
 
 	t = i_new(struct mail_index_transaction, 1);
diff --git a/src/lib-index/mail-index-view-private.h b/src/lib-index/mail-index-view-private.h
index 6d2705947f..478c9ab07e 100644
--- a/src/lib-index/mail-index-view-private.h
+++ b/src/lib-index/mail-index-view-private.h
@@ -74,7 +74,6 @@ struct mail_index_view {
 	ARRAY(union mail_index_view_module_context *) module_contexts;
 
 	struct mail_index_transaction *transactions_list;
-	int transactions;
 
 	bool inconsistent:1;
 	/* this view was created by mail_index_sync_begin() */
diff --git a/src/lib-index/mail-index-view-sync.c b/src/lib-index/mail-index-view-sync.c
index ea50ca3ed9..2af33f97a9 100644
--- a/src/lib-index/mail-index-view-sync.c
+++ b/src/lib-index/mail-index-view-sync.c
@@ -553,7 +553,7 @@ mail_index_view_sync_begin(struct mail_index_view *view,
 	int ret;
 
 	i_assert(!view->syncing);
-	i_assert(view->transactions == 0);
+	i_assert(view->transactions_list == NULL);
 
 	view->syncing = TRUE;
 
diff --git a/src/lib-index/mail-index-view.c b/src/lib-index/mail-index-view.c
index 4d4e251afc..eaf51b7074 100644
--- a/src/lib-index/mail-index-view.c
+++ b/src/lib-index/mail-index-view.c
@@ -101,21 +101,7 @@ struct mail_index *mail_index_view_get_index(struct mail_index_view *view)
 
 bool mail_index_view_have_transactions(struct mail_index_view *view)
 {
-	i_assert(view->transactions >= 0);
-
-	return view->transactions > 0;
-}
-
-void mail_index_view_transaction_ref(struct mail_index_view *view)
-{
-	view->transactions++;
-}
-
-void mail_index_view_transaction_unref(struct mail_index_view *view)
-{
-	i_assert(view->transactions > 0);
-
-	view->transactions--;
+	return view->transactions_list != NULL;
 }
 
 static void mail_index_view_ref_map(struct mail_index_view *view,
@@ -427,7 +413,7 @@ void mail_index_view_close(struct mail_index_view **_view)
 	if (--view->refcount > 0)
 		return;
 
-	i_assert(view->transactions == 0);
+	i_assert(view->transactions_list == NULL);
 
 	view->v.close(view);
 }