From: Timo Sirainen Date: Fri, 28 Jul 2023 09:49:50 +0000 (+0300) Subject: lib-fs: Remove event_parent parameter from fs_vfuncs.init() X-Git-Tag: 2.4.1~1414 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9653cabf88fa4137a13f8be69283f03e9661fd4;p=thirdparty%2Fdovecot%2Fcore.git lib-fs: Remove event_parent parameter from fs_vfuncs.init() fs->event should be used instead. --- diff --git a/src/lib-fs/fs-api-private.h b/src/lib-fs/fs-api-private.h index add6c9a4a8..19343f61a5 100644 --- a/src/lib-fs/fs-api-private.h +++ b/src/lib-fs/fs-api-private.h @@ -28,7 +28,6 @@ extern struct fs_api_module_register fs_api_module_register; struct fs_vfuncs { struct fs *(*alloc)(void); int (*init)(struct fs *fs, const char *args, - struct event *event_parent, const struct fs_parameters *params, const char **error_r); void (*deinit)(struct fs *fs); diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c index 5ad714ff86..71b3b9fae4 100644 --- a/src/lib-fs/fs-api.c +++ b/src/lib-fs/fs-api.c @@ -52,7 +52,7 @@ fs_alloc(const struct fs *fs_class, const char *args, fs->event = fs_create_event(fs, event_parent); T_BEGIN { - ret = fs_class->v.init(fs, args, event_parent, params, &error); + ret = fs_class->v.init(fs, args, params, &error); } T_END_PASS_STR_IF(ret < 0, &error); if (ret < 0) { *error_r = t_strdup_printf("%s: %s", fs_class->name, error); diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c index e2a2735dd5..612672cd95 100644 --- a/src/lib-fs/fs-dict.c +++ b/src/lib-fs/fs-dict.c @@ -46,7 +46,7 @@ static struct fs *fs_dict_alloc(void) } static int -fs_dict_init(struct fs *_fs, const char *args, struct event *event_parent, +fs_dict_init(struct fs *_fs, const char *args, const struct fs_parameters *params, const char **error_r) { struct dict_fs *fs = (struct dict_fs *)_fs; @@ -73,7 +73,7 @@ fs_dict_init(struct fs *_fs, const char *args, struct event *event_parent, i_zero(&dict_set); dict_set.base_dir = params->base_dir; - dict_set.event_parent = event_parent; + dict_set.event_parent = _fs->event; if (dict_init_legacy(p, &dict_set, &fs->dict, &error) < 0) { *error_r = t_strdup_printf("dict_init(%s) failed: %s", diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c index 2a2a66d0b3..8b2e28e013 100644 --- a/src/lib-fs/fs-metawrap.c +++ b/src/lib-fs/fs-metawrap.c @@ -47,8 +47,7 @@ static struct fs *fs_metawrap_alloc(void) static int fs_metawrap_init(struct fs *_fs, const char *args, - struct event *event_parent, const struct fs_parameters *params, - const char **error_r) + const struct fs_parameters *params, const char **error_r) { struct metawrap_fs *fs = METAWRAP_FS(_fs); const char *parent_name, *parent_args; @@ -66,7 +65,7 @@ fs_metawrap_init(struct fs *_fs, const char *args, parent_name = t_strdup_until(args, parent_args); parent_args++; } - if (fs_init(parent_name, parent_args, event_parent, params, + if (fs_init(parent_name, parent_args, _fs->event, params, &_fs->parent, error_r) < 0) return -1; if ((fs_get_properties(_fs->parent) & FS_PROPERTY_METADATA) == 0) diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c index 0cfe01f617..93b0954ce3 100644 --- a/src/lib-fs/fs-posix.c +++ b/src/lib-fs/fs-posix.c @@ -77,7 +77,6 @@ static struct fs *fs_posix_alloc(void) static int fs_posix_init(struct fs *_fs, const char *args, - struct event *event_parent ATTR_UNUSED, const struct fs_parameters *params, const char **error_r) { struct posix_fs *fs = container_of(_fs, struct posix_fs, fs); diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c index 16a9e9b5e7..9c7d609ccf 100644 --- a/src/lib-fs/fs-randomfail.c +++ b/src/lib-fs/fs-randomfail.c @@ -163,7 +163,7 @@ static int fs_randomfail_parse_params(struct randomfail_fs *fs, } static int -fs_randomfail_init(struct fs *_fs, const char *args, struct event *event_parent, +fs_randomfail_init(struct fs *_fs, const char *args, const struct fs_parameters *params, const char **error_r) { struct randomfail_fs *fs = RANDOMFAIL_FS(_fs); @@ -194,7 +194,7 @@ fs_randomfail_init(struct fs *_fs, const char *args, struct event *event_parent, parent_name = t_strdup_until(args, parent_args); parent_args++; } - if (fs_init(parent_name, parent_args, event_parent, params, + if (fs_init(parent_name, parent_args, _fs->event, params, &_fs->parent, error_r) < 0) return -1; return 0; diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c index 27f9108c0a..d483ad138c 100644 --- a/src/lib-fs/fs-sis-queue.c +++ b/src/lib-fs/fs-sis-queue.c @@ -29,7 +29,7 @@ static struct fs *fs_sis_queue_alloc(void) } static int -fs_sis_queue_init(struct fs *_fs, const char *args, struct event *event_parent, +fs_sis_queue_init(struct fs *_fs, const char *args, const struct fs_parameters *params, const char **error_r) { struct sis_queue_fs *fs = SISQUEUE_FS(_fs); @@ -51,7 +51,7 @@ fs_sis_queue_init(struct fs *_fs, const char *args, struct event *event_parent, parent_args = ""; else parent_name = t_strdup_until(parent_name, parent_args++); - if (fs_init(parent_name, parent_args, event_parent, params, + if (fs_init(parent_name, parent_args, _fs->event, params, &_fs->parent, error_r) < 0) return -1; return 0; diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c index fc59b25d2b..8af9556a3d 100644 --- a/src/lib-fs/fs-sis.c +++ b/src/lib-fs/fs-sis.c @@ -41,7 +41,7 @@ static struct fs *fs_sis_alloc(void) } static int -fs_sis_init(struct fs *_fs, const char *args, struct event *event_parent, +fs_sis_init(struct fs *_fs, const char *args, const struct fs_parameters *params, const char **error_r) { enum fs_properties props; @@ -60,7 +60,7 @@ fs_sis_init(struct fs *_fs, const char *args, struct event *event_parent, parent_name = t_strdup_until(args, parent_args); parent_args++; } - if (fs_init(parent_name, parent_args, event_parent, params, + if (fs_init(parent_name, parent_args, _fs->event, params, &_fs->parent, error_r) < 0) return -1; props = fs_get_properties(_fs->parent); diff --git a/src/lib-fs/fs-test.c b/src/lib-fs/fs-test.c index ba215b6bb3..262497b1c4 100644 --- a/src/lib-fs/fs-test.c +++ b/src/lib-fs/fs-test.c @@ -18,7 +18,6 @@ static struct fs *fs_test_alloc(void) static int fs_test_init(struct fs *_fs ATTR_UNUSED, const char *args ATTR_UNUSED, - struct event *event_parent ATTR_UNUSED, const struct fs_parameters *params ATTR_UNUSED, const char **error_r ATTR_UNUSED) { diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c index 20d41eac2d..228b373614 100644 --- a/src/plugins/fs-compress/fs-compress.c +++ b/src/plugins/fs-compress/fs-compress.c @@ -46,7 +46,7 @@ static struct fs *fs_compress_alloc(void) static int fs_compress_init(struct fs *_fs, const char *args, - struct event *event_parent, const struct fs_parameters *params, + const struct fs_parameters *params, const char **error_r) { struct compress_fs *fs = COMPRESS_FS(_fs); @@ -100,7 +100,7 @@ fs_compress_init(struct fs *_fs, const char *args, parent_name = t_strdup_until(args, parent_args); parent_args++; } - return fs_init(parent_name, parent_args, event_parent, params, + return fs_init(parent_name, parent_args, _fs->event, params, &_fs->parent, error_r); } diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c index a19521829c..2001fa901d 100644 --- a/src/plugins/mail-crypt/fs-crypt-common.c +++ b/src/plugins/mail-crypt/fs-crypt-common.c @@ -62,7 +62,7 @@ static struct fs *fs_crypt_alloc(void) } static int -fs_crypt_init(struct fs *_fs, const char *args, struct event *event_parent, +fs_crypt_init(struct fs *_fs, const char *args, const struct fs_parameters *params, const char **error_r) { struct crypt_fs *fs = CRYPT_FS(_fs); @@ -116,7 +116,7 @@ fs_crypt_init(struct fs *_fs, const char *args, struct event *event_parent, parent_name = t_strdup_until(args, parent_args); parent_args++; } - if (fs_init(parent_name, parent_args, event_parent, params, + if (fs_init(parent_name, parent_args, _fs->event, params, &_fs->parent, error_r) < 0) return -1; fs->enc_algo = i_strdup(enc_algo);