From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 15 Nov 2022 23:31:05 +0000 (+0200)
Subject: lib-storage: Remove unnecessary prefixless_ns_unexpanded_set
X-Git-Tag: 2.4.0~3338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c7aeb95d0d276542c538da4cf0f2fa68bbb045b;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove unnecessary prefixless_ns_unexpanded_set
---

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index b6a8c83a99..97954c1418 100644
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -11,7 +11,7 @@
 #include "mail-namespace.h"
 
 
-static struct mail_namespace_settings prefixless_ns_unexpanded_set = {
+static struct mail_namespace_settings prefixless_ns_set = {
 	.name = "",
 	.type = "private",
 	.separator = "",
@@ -29,7 +29,6 @@ static struct mail_namespace_settings prefixless_ns_unexpanded_set = {
 
 	.mailboxes = ARRAY_INIT
 };
-static struct mail_namespace_settings prefixless_ns_set;
 
 void mail_namespace_add_storage(struct mail_namespace *ns,
 				struct mail_storage *storage)
@@ -401,11 +400,6 @@ int mail_namespaces_init_finish(struct mail_namespace *namespaces,
 			prefixless_found = TRUE;
 	}
 	if (!prefixless_found) {
-		prefixless_ns_set = prefixless_ns_unexpanded_set;
-		/* a pretty evil way to expand the values */
-		prefixless_ns_set.prefix++;
-		prefixless_ns_set.location++;
-
 		if (mail_namespaces_init_add(namespaces->user,
 					     &prefixless_ns_set,
 					     &ns, error_r) < 0)