From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 1 Jun 2023 08:38:05 +0000 (+0300)
Subject: fts-solr: Use FTS_SOLR_USER_CONTEXT_REQUIRE() where possible
X-Git-Tag: 2.4.0~2713
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e14ba853c871d3451108f91ea1a0f3efbc8be2f;p=thirdparty%2Fdovecot%2Fcore.git

fts-solr: Use FTS_SOLR_USER_CONTEXT_REQUIRE() where possible
---

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index ce147c80f1..c1fc8d00aa 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -386,7 +386,8 @@ static int fts_backend_solr_commit(struct solr_fts_backend_update_context *ctx)
 {
 	struct solr_fts_backend *backend =
 		(struct solr_fts_backend *) ctx->ctx.backend;
-	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(ctx->ctx.backend->ns->user);
+	struct fts_solr_user *fuser =
+		FTS_SOLR_USER_CONTEXT_REQUIRE(ctx->ctx.backend->ns->user);
 
 	if (!fuser->set.soft_commit)
 		return 0;
@@ -502,7 +503,8 @@ fts_backend_solr_uid_changed(struct solr_fts_backend_update_context *ctx,
 {
 	struct solr_fts_backend *backend =
 		(struct solr_fts_backend *)ctx->ctx.backend;
-	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(ctx->ctx.backend->ns->user);
+	struct fts_solr_user *fuser =
+		FTS_SOLR_USER_CONTEXT_REQUIRE(ctx->ctx.backend->ns->user);
 
 	if (ctx->mails_since_flush >= fuser->set.batch_size) {
 		if (fts_backed_solr_build_flush(ctx) < 0)