From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 23 Jan 2018 08:49:40 +0000 (+0200)
Subject: fts-lucene: Add and use FTS_LUCENE_USER_CONTEXT_REQUIRE
X-Git-Tag: 2.3.9~2437
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a220c655b1a3d923713afe8b83641c1050b44dba;p=thirdparty%2Fdovecot%2Fcore.git

fts-lucene: Add and use FTS_LUCENE_USER_CONTEXT_REQUIRE

Satisfies static analyzers
---

diff --git a/src/plugins/fts-lucene/fts-backend-lucene.c b/src/plugins/fts-lucene/fts-backend-lucene.c
index 8ab8c0aa16..70dc16d487 100644
--- a/src/plugins/fts-lucene/fts-backend-lucene.c
+++ b/src/plugins/fts-lucene/fts-backend-lucene.c
@@ -175,7 +175,7 @@ fts_backend_lucene_get_last_uid(struct fts_backend *_backend,
 	struct lucene_fts_backend *backend =
 		(struct lucene_fts_backend *)_backend;
 	struct fts_lucene_user *fuser =
-		FTS_LUCENE_USER_CONTEXT(_backend->ns->user);
+		FTS_LUCENE_USER_CONTEXT_REQUIRE(_backend->ns->user);
 	struct fts_index_header hdr;
 	uint32_t set_checksum;
 	int ret;
@@ -213,7 +213,7 @@ fts_backend_lucene_update_init(struct fts_backend *_backend)
 		(struct lucene_fts_backend *)_backend;
 	struct lucene_fts_backend_update_context *ctx;
 	struct fts_lucene_user *fuser =
-		FTS_LUCENE_USER_CONTEXT(_backend->ns->user);
+		FTS_LUCENE_USER_CONTEXT_REQUIRE(_backend->ns->user);
 
 	i_assert(!backend->updating);
 
diff --git a/src/plugins/fts-lucene/fts-lucene-plugin.c b/src/plugins/fts-lucene/fts-lucene-plugin.c
index a34f4743ed..d00c674cf8 100644
--- a/src/plugins/fts-lucene/fts-lucene-plugin.c
+++ b/src/plugins/fts-lucene/fts-lucene-plugin.c
@@ -94,7 +94,7 @@ uint32_t fts_lucene_settings_checksum(const struct fts_lucene_settings *set)
 
 static void fts_lucene_mail_user_deinit(struct mail_user *user)
 {
-	struct fts_lucene_user *fuser = FTS_LUCENE_USER_CONTEXT(user);
+	struct fts_lucene_user *fuser = FTS_LUCENE_USER_CONTEXT_REQUIRE(user);
 
 	if (fuser->set.use_libfts)
 		fts_mail_user_deinit(user);
diff --git a/src/plugins/fts-lucene/fts-lucene-plugin.h b/src/plugins/fts-lucene/fts-lucene-plugin.h
index b8f3f36b69..69440fb14a 100644
--- a/src/plugins/fts-lucene/fts-lucene-plugin.h
+++ b/src/plugins/fts-lucene/fts-lucene-plugin.h
@@ -7,6 +7,8 @@
 
 #define FTS_LUCENE_USER_CONTEXT(obj) \
 	MODULE_CONTEXT(obj, fts_lucene_user_module)
+#define FTS_LUCENE_USER_CONTEXT_REQUIRE(obj) \
+	MODULE_CONTEXT_REQUIRE(obj, fts_lucene_user_module)
 
 struct fts_lucene_settings {
 	const char *default_language;