lib-fs: Rename fs_settings.event to event_parent

This makes it more consistent with other settings.

diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
index 22c3dd7d36c5068ba611db9607b01041f9e1a4a2..cac183bef716ba5b2fd6aba05d2c4c203913bfa7 100644 (file)
--- a/src/lib-fs/fs-api.c
+++ b/src/lib-fs/fs-api.c
@@ -50,7 +50,7 @@ fs_alloc(const struct fs *fs_class, const char *args,
        fs->set.debug = set->debug;
        fs->set.enable_timing = set->enable_timing;
        i_array_init(&fs->module_contexts, 5);
-       fs->event = fs_create_event(fs, set->event);
+       fs->event = fs_create_event(fs, set->event_parent);
        event_set_forced_debug(fs->event, fs->set.debug);
 
        T_BEGIN {

diff --git a/src/lib-fs/fs-api.h b/src/lib-fs/fs-api.h
index ac38098347e48091312829908a4339053bf67021..c4918f557693b1c2816e6d23adafe980146c5de9 100644 (file)
--- a/src/lib-fs/fs-api.h
+++ b/src/lib-fs/fs-api.h
@@ -148,7 +148,7 @@ struct fs_settings {
 
        /* Parent event to use, unless overridden by
           fs_file_init_with_event() */
-       struct event *event;
+       struct event *event_parent;
 
        /* Enable debugging */
        bool debug;

diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c
index aa82d124afaf9dca76e87c403f7cdbfd5ac16cd9..6a0a8bd026ed7d16a75ed4252d528cbe18c9dbbb 100644 (file)
--- a/src/lib-fs/fs-dict.c
+++ b/src/lib-fs/fs-dict.c
@@ -74,7 +74,7 @@ fs_dict_init(struct fs *_fs, const char *args, const struct fs_settings *set,
        i_zero(&dict_set);
        dict_set.username = set->username;
        dict_set.base_dir = set->base_dir;
-       dict_set.event_parent = set->event;
+       dict_set.event_parent = set->event_parent;
 
        if (dict_init(p, &dict_set, &fs->dict, &error) < 0) {
                *error_r = t_strdup_printf("dict_init(%s) failed: %s",

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index df09edfefa8e45d198db3e2f9ad7c182a77e5f82..b9408706851033a992beb47bb2125bd3e3c9f13a 100644 (file)
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -702,7 +702,7 @@ void mail_user_init_fs_settings(struct mail_user *user,
                                struct fs_settings *fs_set,
                                struct ssl_iostream_settings *ssl_set)
 {
-       fs_set->event = user->event;
+       fs_set->event_parent = user->event;
        fs_set->username = user->username;
        fs_set->session_id = user->session_id;
        fs_set->base_dir = user->set->base_dir;