lib-storage: mailbox_list_init_fs() - Don't allow NULL parent event

There are no callers that use NULL.

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index bac12574af0ccb04aa9b36ffb9762906925ca9bb..b5fcf89c690dde51c7e04d4c84ba026a0d189e97 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -2088,13 +2088,13 @@ int mailbox_list_init_fs(struct mailbox_list *list, struct event *event_parent,
        struct mailbox_list_fs_context *ctx;
        struct fs *parent_fs;
 
+       i_assert(event_parent != NULL);
+
        i_zero(&fs_params);
        mail_user_init_fs_parameters(list->ns->user, &fs_params);
        fs_params.root_path = root_dir;
        fs_params.temp_file_prefix = mailbox_list_get_global_temp_prefix(list);
 
-       if (event_parent == NULL)
-               event_parent = list->ns->user->event;
        if (fs_legacy_init(driver, args, event_parent, &fs_params,
                           fs_r, error_r) < 0)
                return -1;

diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h
index 81e4560e780f5d226a3bf09335270968216800ef..23d3cd07f44e7e42fc5fd2007a0c94a481747aed 100644 (file)
--- a/src/lib-storage/mailbox-list.h
+++ b/src/lib-storage/mailbox-list.h
@@ -337,8 +337,7 @@ mailbox_list_get_last_internal_error(struct mailbox_list *list,
 void mailbox_list_last_error_push(struct mailbox_list *list);
 void mailbox_list_last_error_pop(struct mailbox_list *list);
 
-/* Create a fs based on the settings in the given mailbox_list. If event_parent
-   is NULL, use user->event as the parent. */
+/* Create a fs based on the settings in the given mailbox_list. */
 int mailbox_list_init_fs(struct mailbox_list *list, struct event *event_parent,
                         const char *driver,
                         const char *args, const char *root_dir,