From 19b6330127b559490a1deb80ed54dae6cfa3ddce Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Wed, 17 Jan 2018 12:14:22 +0200 Subject: [PATCH] mail-crypt: Contexts are now required or checked Satisfies static analyzers --- src/plugins/mail-crypt/mail-crypt-acl-plugin.c | 2 +- src/plugins/mail-crypt/mail-crypt-plugin.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c index 8fc6216e8b..a9c42baafd 100644 --- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c +++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c @@ -17,7 +17,7 @@ #include "mail-crypt-plugin.h" #define MAIL_CRYPT_ACL_LIST_CONTEXT(obj) \ - MODULE_CONTEXT(obj, mail_crypt_acl_mailbox_list_module) + MODULE_CONTEXT_REQUIRE(obj, mail_crypt_acl_mailbox_list_module) struct mail_crypt_acl_mailbox_list { union mailbox_list_module_context module_ctx; diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c index bdd80eba37..d03bdb8263 100644 --- a/src/plugins/mail-crypt/mail-crypt-plugin.c +++ b/src/plugins/mail-crypt/mail-crypt-plugin.c @@ -34,9 +34,9 @@ struct mail_crypt_mailbox { const char *mail_crypt_plugin_version = DOVECOT_ABI_VERSION; #define MAIL_CRYPT_MAIL_CONTEXT(obj) \ - MODULE_CONTEXT(obj, mail_crypt_mail_module) + MODULE_CONTEXT_REQUIRE(obj, mail_crypt_mail_module) #define MAIL_CRYPT_CONTEXT(obj) \ - MODULE_CONTEXT(obj, mail_crypt_storage_module) + MODULE_CONTEXT_REQUIRE(obj, mail_crypt_storage_module) #define MAIL_CRYPT_USER_CONTEXT(obj) \ MODULE_CONTEXT(obj, mail_crypt_user_module)