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

All callers either pass an empty string or pass list->ns->prefix
operating on input where the prefix has already been stripped earlier
(by mailbox_list_vname_prepare() or by splitting into hierarchy parts).
The str_begins(vname, ns_prefix, ...) match was effectively dead.

Drop the parameter. Callers updated: mailbox_list_default_get_storage_name(),
mailbox_name_hdr_decode_storage_name(), imapc_list_remote_to_storage_name(),
imapc_list_storage_to_fs_name().

No behavior change.

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index c457ee050cfc4ba272dc235911051e99d7685484..ef151df08b9cd27fdabf723e3063ff82eb71b24c 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -199,7 +199,7 @@ imapc_list_remote_to_storage_name(struct imapc_mailbox_list *list,
        /* typically mailbox_list_escape_name() is used to escape vname into
           a list name. but we want to convert remote IMAP name to a list name,
           so we need to use the remote IMAP separator. */
-       return mailbox_list_escape_name_params(remote_name, "",
+       return mailbox_list_escape_name_params(remote_name,
                list->root_sep,
                mailbox_list_get_hierarchy_sep(&list->list),
                list->list.mail_set->mailbox_list_storage_escape_char[0], "");
@@ -503,7 +503,7 @@ imapc_list_storage_to_fs_name(struct imapc_mailbox_list *list,
                return NULL;
 
        remote_name = imapc_list_storage_to_remote_name(list, storage_name);
-       return mailbox_list_escape_name_params(remote_name, "",
+       return mailbox_list_escape_name_params(remote_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/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c
index 4bcc8e52a215dca16eb0abb62094fef7a92b7e6f..d064e0f7109805351a952142518e3ff29cc88fd3 100644 (file)
--- a/src/lib-storage/list/mailbox-list-index.c
+++ b/src/lib-storage/list/mailbox-list-index.c
@@ -649,7 +649,7 @@ mailbox_name_hdr_decode_storage_name(struct mailbox_list *list,
                else {
                        str_append(storage_name,
                                   mailbox_list_escape_name_params(raw_part,
-                                       "", '\0', list_sep, escape_char,
+                                       '\0', list_sep, escape_char,
                                        list->mail_set->mailbox_directory_name));
                }
        }

diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index 76149946cc6f3e709046690ca06e6f1a5d888e95..19d5d3fb1ad9cd8693d7993474cc6a858938b49e 100644 (file)
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -197,9 +197,8 @@ void mailbox_lists_init(void);
 void mailbox_lists_deinit(void);
 
 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);
+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);

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index f1eb0ec13e918fd62b1711f4b1dbc4ec7b75e9a8..8f8051d33f2d38210f43080943521b19c128f7cb 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -209,19 +209,14 @@ static bool need_escape_dirstart(const char *vname, const char *maildir_name)
 }
 
 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)
+mailbox_list_escape_name_params(const char *vname, char ns_sep, char list_sep,
+                               char escape_char, const char *maildir_name)
 {
        string_t *escaped_name = t_str_new(64);
        bool dirstart = TRUE;
 
        i_assert(escape_char != '\0');
 
-       /* no escaping of namespace prefix */
-       if (str_begins(vname, ns_prefix, &vname))
-               str_append(escaped_name, ns_prefix);
-
        /* escape the mailbox name */
        if (*vname == '~') {
                str_printfa(escaped_name, "%c%02x", escape_char, *vname);
@@ -392,7 +387,6 @@ const char *mailbox_list_default_get_storage_name(struct mailbox_list *list,
                else {
                        str_append(storage_name,
                                   mailbox_list_escape_name_params(raw_parts[i],
-                                  list->ns->prefix,
                                   '\0', /* no separator conversion */
                                   mailbox_list_get_hierarchy_sep(list),
                                   list->mail_set->mailbox_list_storage_escape_char[0],