From: Aki Tuomi Date: Mon, 22 Jan 2018 11:54:58 +0000 (+0200) Subject: lib-storage: Add and use MAIL_STORAGE_CONTEXT_REQUIRE X-Git-Tag: 2.3.1~244 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=603cac0df63769053d32616c64c673f0405101c4;p=thirdparty%2Fdovecot%2Fcore.git 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 cb0e5637c8..2aa6fbebd0 100644 --- 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 9245056381..5f3511fbc9 100644 --- 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);