From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 13 Jul 2023 13:51:15 +0000 (+0000)
Subject: fts: fts_backend_is_uid_indexed() - Flatten the code
X-Git-Tag: 2.4.0~2538
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a62c5e40ea0c7740611810b6faa3dd4d83a5433;p=thirdparty%2Fdovecot%2Fcore.git

fts: fts_backend_is_uid_indexed() - Flatten the code
---

diff --git a/src/plugins/fts/fts-api.c b/src/plugins/fts/fts-api.c
index 9d7bc06323..19c47e4649 100644
--- a/src/plugins/fts/fts-api.c
+++ b/src/plugins/fts/fts-api.c
@@ -136,18 +136,19 @@ int fts_backend_get_last_uid(struct fts_backend *backend, struct mailbox *box,
 int fts_backend_is_uid_indexed(struct fts_backend *backend, struct mailbox *box,
 			       uint32_t uid, uint32_t *last_indexed_uid_r)
 {
+	if (box->virtual_vfuncs == NULL && backend->v.is_uid_indexed != NULL)
+		return backend->v.is_uid_indexed(backend, box, uid,
+						 last_indexed_uid_r);
+
 	uint32_t last_uid;
+	if (fts_backend_get_last_uid(backend, box, &last_uid) < 0)
+		return -1;
 
-	if (box->virtual_vfuncs != NULL || backend->v.is_uid_indexed == NULL) {
-		if (fts_backend_get_last_uid(backend, box, &last_uid) < 0)
-			return -1;
-		if (uid > last_uid) {
-			*last_indexed_uid_r = last_uid;
-			return 0;
-		}
-		return 1;
+	if (uid > last_uid) {
+		*last_indexed_uid_r = last_uid;
+		return 0;
 	}
-	return backend->v.is_uid_indexed(backend, box, uid, last_indexed_uid_r);
+	return 1;
 }
 
 bool fts_backend_is_updating(struct fts_backend *backend)