From: Aki Tuomi Date: Mon, 22 Jan 2018 11:50:37 +0000 (+0200) Subject: lib-index: Add and use CACHE_TRANS_CONTEXT_REQUIRE X-Git-Tag: 2.3.9~2452 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c04adbeb0f214dc323ced079c7380fe9a226cdc5;p=thirdparty%2Fdovecot%2Fcore.git lib-index: Add and use CACHE_TRANS_CONTEXT_REQUIRE Satisfies static analyzers --- diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c index 68e1c02893..d09a47a9d2 100644 --- a/src/lib-index/mail-cache-transaction.c +++ b/src/lib-index/mail-cache-transaction.c @@ -20,6 +20,8 @@ #define CACHE_TRANS_CONTEXT(obj) \ MODULE_CONTEXT(obj, cache_mail_index_transaction_module) +#define CACHE_TRANS_CONTEXT_REQUIRE(obj) \ + MODULE_CONTEXT_REQUIRE(obj, cache_mail_index_transaction_module) struct mail_cache_transaction_rec { uint32_t seq; @@ -57,7 +59,7 @@ static size_t mail_cache_transaction_update_last_rec_size(struct mail_cache_tran static void mail_index_transaction_cache_reset(struct mail_index_transaction *t) { - struct mail_cache_transaction_ctx *ctx = CACHE_TRANS_CONTEXT(t); + struct mail_cache_transaction_ctx *ctx = CACHE_TRANS_CONTEXT_REQUIRE(t); struct mail_index_transaction_vfuncs super = ctx->super; mail_cache_transaction_reset(ctx); @@ -68,7 +70,7 @@ static int mail_index_transaction_cache_commit(struct mail_index_transaction *t, struct mail_index_transaction_commit_result *result_r) { - struct mail_cache_transaction_ctx *ctx = CACHE_TRANS_CONTEXT(t); + struct mail_cache_transaction_ctx *ctx = CACHE_TRANS_CONTEXT_REQUIRE(t); struct mail_index_transaction_vfuncs super = ctx->super; /* a failed cache commit isn't important enough to fail the entire @@ -80,7 +82,7 @@ mail_index_transaction_cache_commit(struct mail_index_transaction *t, static void mail_index_transaction_cache_rollback(struct mail_index_transaction *t) { - struct mail_cache_transaction_ctx *ctx = CACHE_TRANS_CONTEXT(t); + struct mail_cache_transaction_ctx *ctx = CACHE_TRANS_CONTEXT_REQUIRE(t); struct mail_index_transaction_vfuncs super = ctx->super; mail_cache_transaction_rollback(&ctx);