imapc: Rename imapc_list_to_remote() to imapc_list_storage_to_remote_name()

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index c2f3c478ae54a0bad715394eac641cf0ebafd5da..c764434ba3a6b820b33ba075c9ae6556d8a419d9 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -170,7 +170,9 @@ imapc_list_to_vname(struct imapc_mailbox_list *list, const char *imapc_name)
        return mailbox_list_get_vname(&list->list, list_name);
 }
 
-const char *imapc_list_to_remote(struct imapc_mailbox_list *list, const char *name)
+const char *
+imapc_list_storage_to_remote_name(struct imapc_mailbox_list *list,
+                                 const char *name)
 {
        return mailbox_list_unescape_name_params(name, "", list->root_sep,
                                mailbox_list_get_hierarchy_sep(&list->list),
@@ -830,7 +832,7 @@ static int imapc_list_set_subscribed(struct mailbox_list *_list,
        cmd = imapc_list_simple_context_init(&ctx, list);
        imapc_command_set_flags(cmd, IMAPC_COMMAND_FLAG_RETRIABLE);
        imapc_command_sendf(cmd, set ? "SUBSCRIBE %s" : "UNSUBSCRIBE %s",
-                           imapc_list_to_remote(list, name));
+                           imapc_list_storage_to_remote_name(list, name));
        imapc_simple_run(&ctx, &cmd);
        return ctx.ret;
 }
@@ -864,7 +866,7 @@ imapc_list_delete_mailbox(struct mailbox_list *_list, const char *name)
 
        cmd = imapc_list_simple_context_init(&ctx, list);
        imapc_command_set_flags(cmd, IMAPC_COMMAND_FLAG_RETRIABLE);
-       imapc_command_sendf(cmd, "DELETE %s", imapc_list_to_remote(list, name));
+       imapc_command_sendf(cmd, "DELETE %s", imapc_list_storage_to_remote_name(list, name));
        imapc_simple_run(&ctx, &cmd);
 
        if (fs_list != NULL && ctx.ret == 0) {
@@ -912,8 +914,8 @@ imapc_list_rename_mailbox(struct mailbox_list *oldlist, const char *oldname,
 
        cmd = imapc_list_simple_context_init(&ctx, list);
        imapc_command_sendf(cmd, "RENAME %s %s",
-                           imapc_list_to_remote(list, oldname),
-                           imapc_list_to_remote(list, newname));
+                           imapc_list_storage_to_remote_name(list, oldname),
+                           imapc_list_storage_to_remote_name(list, newname));
        imapc_simple_run(&ctx, &cmd);
        if (ctx.ret == 0 && fs_list != NULL && oldlist == newlist) {
                oldname = imapc_list_get_fs_name(list, oldname);

diff --git a/src/lib-storage/index/imapc/imapc-list.h b/src/lib-storage/index/imapc/imapc-list.h
index b86060c25fcb3d1561ab3c68dcce956ed39e75ae..11df6b08b3e6f7b93e804f24f1f498b257c65c2e 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.h
+++ b/src/lib-storage/index/imapc/imapc-list.h
@@ -35,6 +35,7 @@ struct imapc_mailbox_list {
 int imapc_list_get_mailbox_flags(struct mailbox_list *list, const char *name,
                                 enum mailbox_info_flags *flags_r);
 int imapc_list_try_get_root_sep(struct imapc_mailbox_list *list, char *sep_r);
-const char *imapc_list_to_remote(struct imapc_mailbox_list *list, const char *name);
+const char *imapc_list_storage_to_remote_name(struct imapc_mailbox_list *list,
+                                             const char *storage_name);
 
 #endif

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 4cae3d5d8dd7675ea994205dd19e11433843d1c7..9a03504cd8c4ffa7789c139cd7455dff31183ddb 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -512,10 +512,12 @@ imapc_mailbox_alloc(struct mail_storage *storage, struct mailbox_list *list,
 
 const char *imapc_mailbox_get_remote_name(struct imapc_mailbox *mbox)
 {
+       struct imapc_mailbox_list *list =
+               container_of(mbox->box.list, struct imapc_mailbox_list, list);
+
        if (strcmp(mbox->box.list->name, MAILBOX_LIST_NAME_IMAPC) != 0)
                return mbox->box.name;
-       return imapc_list_to_remote((struct imapc_mailbox_list *)mbox->box.list,
-                                   mbox->box.name);
+       return imapc_list_storage_to_remote_name(list, mbox->box.name);
 }
 
 static int