From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 30 Apr 2026 09:03:08 +0000 (+0000)
Subject: lib-storage: mailbox_list_unescape_name_params() - Drop unused ns_prefix parameter
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d2f067f0002ee0da3ead2a2d1c55896433fa473f;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mailbox_list_unescape_name_params() - Drop unused ns_prefix parameter

Symmetric to the previous escape_name_params() cleanup. The three
callers (mailbox_list_default_get_vname_part(),
imapc_list_storage_to_remote_name(), imapc_list_fs_to_storage_name())
either pass an empty string or operate on a single hierarchy part
that won't start with the namespace prefix.

No behavior change.
---

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index ef151df08b..67fa709c14 100644
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -217,7 +217,7 @@ const char *
 imapc_list_storage_to_remote_name(struct imapc_mailbox_list *list,
 				  const char *storage_name)
 {
-	return mailbox_list_unescape_name_params(storage_name, "",
+	return mailbox_list_unescape_name_params(storage_name,
 		list->root_sep, mailbox_list_get_hierarchy_sep(&list->list),
 		list->list.mail_set->mailbox_list_storage_escape_char[0]);
 }
@@ -518,7 +518,7 @@ imapc_list_fs_to_storage_name(struct imapc_mailbox_list *list,
 	if (fs_name == NULL)
 		return NULL;
 
-	remote_name = mailbox_list_unescape_name_params(fs_name, "",
+	remote_name = mailbox_list_unescape_name_params(fs_name,
 			list->root_sep,
 			mailbox_list_get_hierarchy_sep(fs_list),
 			fs_list->mail_set->mailbox_list_storage_escape_char[0]);
diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index 19d5d3fb1a..93826ee8c5 100644
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -200,8 +200,8 @@ const char *
 mailbox_list_escape_name_params(const char *vname, char ns_sep, char list_sep,
 				char escape_char, const char *maildir_name);
 const char *
-mailbox_list_unescape_name_params(const char *src, const char *ns_prefix,
-				  char ns_sep, char list_sep, char escape_char);
+mailbox_list_unescape_name_params(const char *src, char ns_sep, char list_sep,
+				  char escape_char);
 
 int mailbox_list_default_get_storage(struct mailbox_list **list,
 				     const char **vname,
diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 8f8051d33f..352e116391 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -403,15 +403,12 @@ const char *mailbox_list_get_storage_name(struct mailbox_list *list,
 }
 
 const char *
-mailbox_list_unescape_name_params(const char *src, const char *ns_prefix,
-				  char ns_sep, char list_sep, char escape_char)
+mailbox_list_unescape_name_params(const char *src, char ns_sep, char list_sep,
+				  char escape_char)
 {
 	string_t *dest = t_str_new(strlen(src));
 	unsigned int num;
 
-	if (str_begins(src, ns_prefix, &src))
-		str_append(dest, ns_prefix);
-
 	for (; *src != '\0'; src++) {
 		if (*src == escape_char &&
 		    i_isxdigit(src[1]) && i_isxdigit(src[2])) {
@@ -495,7 +492,6 @@ mailbox_list_default_get_vname_part(struct mailbox_list *list,
 
 	if (list->mail_set->mailbox_list_storage_escape_char[0] != '\0') {
 		vname = mailbox_list_unescape_name_params(vname,
-				list->ns->prefix,
 				'\0', '\0', /* no separator conversion */
 				list->mail_set->mailbox_list_storage_escape_char[0]);
 	}