From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 14 Jan 2021 13:22:20 +0000 (+0200)
Subject: lib-storage: Remove mailbox_list_unescape_name() by moving its code inline
X-Git-Tag: 2.3.14.rc1~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4224bb8302b59acf83ca15f260fd243ddacb939c;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove mailbox_list_unescape_name() by moving its code inline

There was only a single caller for this function. It doesn't need to exist.
---

diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index 8a2dfabd12..6a04b9bf17 100644
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -193,8 +193,6 @@ mailbox_list_escape_name_params(const char *vname, const char *ns_prefix,
 				char ns_sep, char list_sep, char escape_char,
 				const char *maildir_name);
 const char *
-mailbox_list_unescape_name(struct mailbox_list *list, const char *src);
-const char *
 mailbox_list_unescape_name_params(const char *src, const char *ns_prefix,
 				  char ns_sep, char list_sep, char escape_char);
 
diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 524bb40bf5..c33764ab68 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -686,15 +686,6 @@ mailbox_list_unescape_name_params(const char *src, const char *ns_prefix,
 	return str_c(dest);
 }
 
-const char *
-mailbox_list_unescape_name(struct mailbox_list *list, const char *src)
-{
-	return mailbox_list_unescape_name_params(src, list->ns->prefix,
-				mail_namespace_get_sep(list->ns),
-				mailbox_list_get_hierarchy_sep(list),
-				list->set.storage_name_escape_char);
-}
-
 static void
 mailbox_list_escape_broken_chars(struct mailbox_list *list, string_t *str)
 {
@@ -775,7 +766,11 @@ const char *mailbox_list_default_get_vname(struct mailbox_list *list,
 
 	prefix_len = strlen(list->ns->prefix);
 	if (list->set.storage_name_escape_char != '\0') {
-		vname = mailbox_list_unescape_name(list, vname);
+		vname = mailbox_list_unescape_name_params(vname,
+				list->ns->prefix,
+				mail_namespace_get_sep(list->ns),
+				mailbox_list_get_hierarchy_sep(list),
+				list->set.storage_name_escape_char);
 		return prefix_len == 0 ? vname :
 			t_strconcat(list->ns->prefix, vname, NULL);
 	}