lib-storage: Remove mailbox_list_escape_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 f4fd01a63bb3da357fa1900ff0dbaf266215ad52..8a2dfabd12c029b258c7ff69b7efdd9d393dfa5f 100644 (file)
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -189,8 +189,6 @@ int mailbox_list_settings_parse(struct mail_user *user, const char *data,
                                struct mailbox_list_settings *set_r,
                                const char **error_r);
 const char *
-mailbox_list_escape_name(struct mailbox_list *list, const char *vname);
-const char *
 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);

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 72936bd412642f19672c89891991c0a642cf76eb..524bb40bf596f215888c6a520441f0f324ea0076 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -515,16 +515,6 @@ mailbox_list_escape_name_params(const char *vname, const char *ns_prefix,
        return str_c(escaped_name);
 }
 
-const char *
-mailbox_list_escape_name(struct mailbox_list *list, const char *vname)
-{
-       return mailbox_list_escape_name_params(vname, list->ns->prefix,
-                               mail_namespace_get_sep(list->ns),
-                               mailbox_list_get_hierarchy_sep(list),
-                               list->set.storage_name_escape_char,
-                               list->set.maildir_name);
-}
-
 static int
 mailbox_list_unescape_broken_chars(struct mailbox_list *list, char *name)
 {
@@ -584,8 +574,14 @@ const char *mailbox_list_default_get_storage_name(struct mailbox_list *list,
        if (strcasecmp(storage_name, "INBOX") == 0 &&
            (ns->flags & NAMESPACE_FLAG_INBOX_USER) != 0)
                storage_name = "INBOX";
-       else if (list->set.storage_name_escape_char != '\0')
-               storage_name = mailbox_list_escape_name(list, vname);
+       else if (list->set.storage_name_escape_char != '\0') {
+               storage_name = mailbox_list_escape_name_params(vname,
+                               ns->prefix,
+                               mail_namespace_get_sep(list->ns),
+                               mailbox_list_get_hierarchy_sep(list),
+                               list->set.storage_name_escape_char,
+                               list->set.maildir_name);
+       }
 
        if (prefix_len > 0 && (strcmp(storage_name, "INBOX") != 0 ||
                               (ns->flags & NAMESPACE_FLAG_INBOX_USER) == 0)) {