fts-solr: Add and use FTS_SOLR_USER_CONTEXT_REQUIRE

Satisfies static analyzers

diff --git a/src/plugins/fts-solr/fts-backend-solr-old.c b/src/plugins/fts-solr/fts-backend-solr-old.c
index 1f7984444d7452eb1066f526ea1661f09c9a5bd7..3fe496cef1296e90878a63d683a898a391270e28 100644 (file)
--- a/src/plugins/fts-solr/fts-backend-solr-old.c
+++ b/src/plugins/fts-solr/fts-backend-solr-old.c
@@ -172,7 +172,7 @@ static void solr_quote_http(string_t *dest, const char *str)
 static void fts_solr_set_default_ns(struct solr_fts_backend *backend)
 {
        struct mail_namespace *ns = backend->backend.ns;
-       struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(ns->user);
+       struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT_REQUIRE(ns->user);
        const struct fts_solr_settings *set = &fuser->set;
        const char *str;
 

diff --git a/src/plugins/fts-solr/fts-solr-plugin.c b/src/plugins/fts-solr/fts-solr-plugin.c
index e91a60225f948dc151e206a8eef9a5677180f1f6..16f6af005fd95c781c4db94399637b75d7bdf992 100644 (file)
--- a/src/plugins/fts-solr/fts-solr-plugin.c
+++ b/src/plugins/fts-solr/fts-solr-plugin.c
@@ -51,7 +51,7 @@ fts_solr_plugin_init_settings(struct mail_user *user,
 
 static void fts_solr_mail_user_deinit(struct mail_user *user)
 {
-       struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(user);
+       struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT_REQUIRE(user);
 
        if (fuser->set.use_libfts)
                fts_mail_user_deinit(user);

diff --git a/src/plugins/fts-solr/fts-solr-plugin.h b/src/plugins/fts-solr/fts-solr-plugin.h
index f2afd5b9c3fc7db1fae59a65f00c879b5ed0335f..f11c48b3772acbbccc9652c328e7845dcf41c543 100644 (file)
--- a/src/plugins/fts-solr/fts-solr-plugin.h
+++ b/src/plugins/fts-solr/fts-solr-plugin.h
@@ -7,6 +7,8 @@
 
 #define FTS_SOLR_USER_CONTEXT(obj) \
        MODULE_CONTEXT(obj, fts_solr_user_module)
+#define FTS_SOLR_USER_CONTEXT_REQUIRE(obj) \
+       MODULE_CONTEXT_REQUIRE(obj, fts_solr_user_module)
 
 struct fts_solr_settings {
        const char *url, *default_ns_prefix;