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 8a2dfabd12c029b258c7ff69b7efdd9d393dfa5f..6a04b9bf17ac44661846edca32786d45219d61c5 100644 (file)
--- 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 524bb40bf596f215888c6a520441f0f324ea0076..c33764ab681c8c4a08c317121015e491df67d142 100644 (file)
--- 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);
        }