lib-storage: Add and use MAIL_STORAGE_CONTEXT_REQUIRE

Satisfies static analyzers

diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c
index 45085ec177eb489d9329ae9962af8f41a17784cc..4b8565d1540ea2fa247594b3b8c8bfec9e041eb0 100644 (file)
--- 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
index 552163f0d5841ea2d92d579d2f2a2b1cf8fc1bb3..77b3afb7e60f5e3a42defe51ec0a62060d03eef6 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -734,6 +734,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);