[PATCH 2/2] lib-storage: Simplify mailbox_mkdir() using mailbox_list_mkdir_root(NULL)

mailbox_mkdir() looked up the root path via mailbox_list_get_root_forced()
only to pass it straight to mailbox_list_mkdir_root(). Let mkdir_root()
resolve the root itself by passing path=NULL, dropping the local variable.

Gbp-Pq: Name 0002-lib-storage-Simplify-mailbox_mkdir-using-mailbox_lis.patch

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index ca51ab5d13a44f592c4d961838ca3d4e55539811..5fe4b81fe8e5b491b03893b9101f3d322144b72d 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -3441,12 +3441,10 @@ int mailbox_mkdir(struct mailbox *box, const char *path,
                  enum mailbox_list_path_type type)
 {
        const struct mailbox_permissions *perm = mailbox_get_permissions(box);
-       const char *root_dir;
 
        if (!perm->gid_origin_is_mailbox_path) {
                /* mailbox root directory doesn't exist, create it */
-               root_dir = mailbox_list_get_root_forced(box->list, type);
-               if (mailbox_list_mkdir_root(box->list, root_dir, type) < 0) {
+               if (mailbox_list_mkdir_root(box->list, NULL, type) < 0) {
                        mail_storage_copy_list_error(box->storage, box->list);
                        return -1;
                }