From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 29 Jan 2025 07:54:39 +0000 (+0200)
Subject: lib-storage: Refactor namespace_have_special_use_mailboxes() into namespace_parse_mai... 
X-Git-Tag: 2.4.1~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a26fbf14d02fdf1bc2c5d7e85ab2a6123fdb027;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Refactor namespace_have_special_use_mailboxes() into namespace_parse_mailboxes()

Simplifies the next commit.
---

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 248cc1a031..4267196124 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -774,9 +774,9 @@ mail_storage_settings_ext_check(struct event *event ATTR_UNUSED,
 }
 
 static int
-namespace_have_special_use_mailboxes(struct event *event,
-				     struct mail_namespace_settings *ns,
-				     const char **error_r)
+namespace_parse_mailboxes(struct event *event,
+			  struct mail_namespace_settings *ns,
+			  const char **error_r)
 {
 	struct mailbox_settings *box_set;
 	const char *box_name, *error;
@@ -804,7 +804,7 @@ namespace_have_special_use_mailboxes(struct event *event,
 		bool have_special_use = array_not_empty(&box_set->special_use);
 		settings_free(box_set);
 		if (have_special_use) {
-			ret = 1;
+			ns->parsed_have_special_use_mailboxes = TRUE;
 			break;
 		}
 	}
@@ -817,7 +817,6 @@ static bool namespace_settings_ext_check(struct event *event,
 					 const char **error_r)
 {
 	struct mail_namespace_settings *ns = _set;
-	int ret;
 
 	if (ns->separator[0] != '\0' && ns->separator[1] != '\0') {
 		*error_r = t_strdup_printf("Namespace %s: "
@@ -831,12 +830,7 @@ static bool namespace_settings_ext_check(struct event *event,
 		return FALSE;
 	}
 
-	ret = namespace_have_special_use_mailboxes(event, ns, error_r);
-	if (ret < 0)
-		return FALSE;
-	if (ret > 0)
-		ns->parsed_have_special_use_mailboxes = TRUE;
-	return TRUE;
+	return namespace_parse_mailboxes(event, ns, error_r) == 0;
 }
 
 static bool mailbox_special_use_exists(const char *name)