lib-storage: Add and use MAIL_STORAGE_CONTEXT_REQUIRE

Satisfies static analyzers
dovecot · Feb 20, 2018 · 603cac0 · 603cac0
1 parent f6a72b4
commit 603cac0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c
@@ -26,7 +26,7 @@ index_transaction_index_commit(struct mail_index_transaction *index_trans,
 			       struct mail_index_transaction_commit_result *result_r)
 {
 	struct mailbox_transaction_context *t =
-		MAIL_STORAGE_CONTEXT(index_trans);
+		MAIL_STORAGE_CONTEXT_REQUIRE(index_trans);
 	struct index_mailbox_sync_pvt_context *pvt_sync_ctx = NULL;
 	const char *error;
 	int ret = 0;
@@ -104,7 +104,7 @@ static void
 index_transaction_index_rollback(struct mail_index_transaction *index_trans)
 {
 	struct mailbox_transaction_context *t =
-		MAIL_STORAGE_CONTEXT(index_trans);
+		MAIL_STORAGE_CONTEXT_REQUIRE(index_trans);
 
 	if (t->attr_pvt_trans != NULL)
 		dict_transaction_rollback(&t->attr_pvt_trans);

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
@@ -737,6 +737,8 @@ extern struct event_category event_category_mail;
 
 #define MAIL_STORAGE_CONTEXT(obj) \
 	MODULE_CONTEXT(obj, mail_storage_mail_index_module)
+#define MAIL_STORAGE_CONTEXT_REQUIRE(obj) \
+	MODULE_CONTEXT_REQUIRE(obj, mail_storage_mail_index_module)
 extern MODULE_CONTEXT_DEFINE(mail_storage_mail_index_module,
 			     &mail_index_module_register);