lib-fs: Use designated initializers for fs_vfuncs structs

diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c
index 936e9b69f12cfe661fb04d9a88cd48834d455a4d..a93aee97bfad594741aa69355f413bcf81bc1e56 100644 (file)
--- a/src/lib-fs/fs-dict.c
+++ b/src/lib-fs/fs-dict.c
@@ -336,37 +336,38 @@ static int fs_dict_iter_deinit(struct fs_iter *_iter)
 const struct fs fs_class_dict = {
        .name = "dict",
        .v = {
-               fs_dict_alloc,
-               fs_dict_init,
-               NULL,
-               fs_dict_free,
-               fs_dict_get_properties,
-               fs_dict_file_alloc,
-               fs_dict_file_init,
-               fs_dict_file_deinit,
-               NULL,
-               NULL,
-               NULL, NULL,
-               fs_default_set_metadata,
-               NULL,
-               fs_dict_prefetch,
-               NULL,
-               fs_dict_read_stream,
-               NULL,
-               fs_dict_write_stream,
-               fs_dict_write_stream_finish,
-               NULL,
-               NULL,
-               NULL,
-               fs_dict_stat,
-               fs_default_copy,
-               NULL,
-               fs_dict_delete,
-               fs_dict_iter_alloc,
-               fs_dict_iter_init,
-               fs_dict_iter_next,
-               fs_dict_iter_deinit,
-               NULL,
-               NULL
+               .alloc = fs_dict_alloc,
+               .init = fs_dict_init,
+               .deinit = NULL,
+               .free = fs_dict_free,
+               .get_properties = fs_dict_get_properties,
+               .file_alloc = fs_dict_file_alloc,
+               .file_init = fs_dict_file_init,
+               .file_deinit = fs_dict_file_deinit,
+               .file_close = NULL,
+               .get_path = NULL,
+               .set_async_callback = NULL,
+               .wait_async = NULL,
+               .set_metadata = fs_default_set_metadata,
+               .get_metadata = NULL,
+               .prefetch = fs_dict_prefetch,
+               .read = NULL,
+               .read_stream = fs_dict_read_stream,
+               .write = NULL,
+               .write_stream = fs_dict_write_stream,
+               .write_stream_finish = fs_dict_write_stream_finish,
+               .lock = NULL,
+               .unlock = NULL,
+               .exists = NULL,
+               .stat = fs_dict_stat,
+               .copy = fs_default_copy,
+               .rename = NULL,
+               .delete_file = fs_dict_delete,
+               .iter_alloc = fs_dict_iter_alloc,
+               .iter_init = fs_dict_iter_init,
+               .iter_next = fs_dict_iter_next,
+               .iter_deinit = fs_dict_iter_deinit,
+               .switch_ioloop = NULL,
+               .get_nlinks = NULL
        }
 };

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index 9dcf9979a09cb215b9d99e46d2eeea50de9f5bc2..f3a87bdb9eadca578dc1617b9319f23fef560297 100644 (file)
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -489,38 +489,38 @@ static int fs_metawrap_copy(struct fs_file *_src, struct fs_file *_dest)
 const struct fs fs_class_metawrap = {
        .name = "metawrap",
        .v = {
-               fs_metawrap_alloc,
-               fs_metawrap_init,
-               NULL,
-               fs_metawrap_free,
-               fs_metawrap_get_properties,
-               fs_metawrap_file_alloc,
-               fs_metawrap_file_init,
-               fs_metawrap_file_deinit,
-               fs_metawrap_file_close,
-               fs_wrapper_file_get_path,
-               fs_wrapper_set_async_callback,
-               fs_wrapper_wait_async,
-               fs_metawrap_set_metadata,
-               fs_metawrap_get_metadata,
-               fs_metawrap_prefetch,
-               fs_metawrap_read,
-               fs_metawrap_read_stream,
-               fs_metawrap_write,
-               fs_metawrap_write_stream,
-               fs_metawrap_write_stream_finish,
-               fs_wrapper_lock,
-               fs_wrapper_unlock,
-               fs_wrapper_exists,
-               fs_metawrap_stat,
-               fs_metawrap_copy,
-               fs_wrapper_rename,
-               fs_wrapper_delete,
-               fs_wrapper_iter_alloc,
-               fs_wrapper_iter_init,
-               fs_wrapper_iter_next,
-               fs_wrapper_iter_deinit,
-               NULL,
-               fs_wrapper_get_nlinks,
+               .alloc = fs_metawrap_alloc,
+               .init = fs_metawrap_init,
+               .deinit = NULL,
+               .free = fs_metawrap_free,
+               .get_properties = fs_metawrap_get_properties,
+               .file_alloc = fs_metawrap_file_alloc,
+               .file_init = fs_metawrap_file_init,
+               .file_deinit = fs_metawrap_file_deinit,
+               .file_close = fs_metawrap_file_close,
+               .get_path = fs_wrapper_file_get_path,
+               .set_async_callback = fs_wrapper_set_async_callback,
+               .wait_async = fs_wrapper_wait_async,
+               .set_metadata = fs_metawrap_set_metadata,
+               .get_metadata = fs_metawrap_get_metadata,
+               .prefetch = fs_metawrap_prefetch,
+               .read = fs_metawrap_read,
+               .read_stream = fs_metawrap_read_stream,
+               .write = fs_metawrap_write,
+               .write_stream = fs_metawrap_write_stream,
+               .write_stream_finish = fs_metawrap_write_stream_finish,
+               .lock = fs_wrapper_lock,
+               .unlock = fs_wrapper_unlock,
+               .exists = fs_wrapper_exists,
+               .stat = fs_metawrap_stat,
+               .copy = fs_metawrap_copy,
+               .rename = fs_wrapper_rename,
+               .delete_file = fs_wrapper_delete,
+               .iter_alloc = fs_wrapper_iter_alloc,
+               .iter_init = fs_wrapper_iter_init,
+               .iter_next = fs_wrapper_iter_next,
+               .iter_deinit = fs_wrapper_iter_deinit,
+               .switch_ioloop = NULL,
+               .get_nlinks = fs_wrapper_get_nlinks,
        }
 };

diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index 65340efa9da04b2e5dc1d61f26014ac56079739d..b60555ddbdf8404d598ebeeed99d21b3c324bc7b 100644 (file)
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -993,37 +993,38 @@ static int fs_posix_iter_deinit(struct fs_iter *_iter)
 const struct fs fs_class_posix = {
        .name = "posix",
        .v = {
-               fs_posix_alloc,
-               fs_posix_init,
-               NULL,
-               fs_posix_free,
-               fs_posix_get_properties,
-               fs_posix_file_alloc,
-               fs_posix_file_init,
-               fs_posix_file_deinit,
-               fs_posix_file_close,
-               NULL,
-               NULL, NULL,
-               fs_default_set_metadata,
-               NULL,
-               fs_posix_prefetch,
-               fs_posix_read,
-               fs_posix_read_stream,
-               fs_posix_write,
-               fs_posix_write_stream,
-               fs_posix_write_stream_finish,
-               fs_posix_lock,
-               fs_posix_unlock,
-               fs_posix_exists,
-               fs_posix_stat,
-               fs_posix_copy,
-               fs_posix_rename,
-               fs_posix_delete,
-               fs_posix_iter_alloc,
-               fs_posix_iter_init,
-               fs_posix_iter_next,
-               fs_posix_iter_deinit,
-               NULL,
-               NULL,
+               .alloc = fs_posix_alloc,
+               .init = fs_posix_init,
+               .deinit = NULL,
+               .free = fs_posix_free,
+               .get_properties = fs_posix_get_properties,
+               .file_alloc = fs_posix_file_alloc,
+               .file_init = fs_posix_file_init,
+               .file_deinit = fs_posix_file_deinit,
+               .file_close = fs_posix_file_close,
+               .get_path = NULL,
+               .set_async_callback = NULL,
+               .wait_async = NULL,
+               .set_metadata = fs_default_set_metadata,
+               .get_metadata = NULL,
+               .prefetch = fs_posix_prefetch,
+               .read = fs_posix_read,
+               .read_stream = fs_posix_read_stream,
+               .write = fs_posix_write,
+               .write_stream = fs_posix_write_stream,
+               .write_stream_finish = fs_posix_write_stream_finish,
+               .lock = fs_posix_lock,
+               .unlock = fs_posix_unlock,
+               .exists = fs_posix_exists,
+               .stat = fs_posix_stat,
+               .copy = fs_posix_copy,
+               .rename = fs_posix_rename,
+               .delete_file = fs_posix_delete,
+               .iter_alloc = fs_posix_iter_alloc,
+               .iter_init = fs_posix_iter_init,
+               .iter_next = fs_posix_iter_next,
+               .iter_deinit = fs_posix_iter_deinit,
+               .switch_ioloop = NULL,
+               .get_nlinks = NULL,
        }
 };

diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index 48b1bf0431994fe7c261deab559ec5484523d8e9..e945bb33ed1253c0a8abf1753625cedc9d9ef51c 100644 (file)
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -518,38 +518,38 @@ static int fs_randomfail_iter_deinit(struct fs_iter *_iter)
 const struct fs fs_class_randomfail = {
        .name = "randomfail",
        .v = {
-               fs_randomfail_alloc,
-               fs_randomfail_init,
-               NULL,
-               fs_randomfail_free,
-               fs_randomfail_get_properties,
-               fs_randomfail_file_alloc,
-               fs_randomfail_file_init,
-               fs_randomfail_file_deinit,
-               fs_wrapper_file_close,
-               fs_wrapper_file_get_path,
-               fs_wrapper_set_async_callback,
-               fs_wrapper_wait_async,
-               fs_wrapper_set_metadata,
-               fs_randomfail_get_metadata,
-               fs_randomfail_prefetch,
-               fs_randomfail_read,
-               fs_randomfail_read_stream,
-               fs_randomfail_write,
-               fs_randomfail_write_stream,
-               fs_randomfail_write_stream_finish,
-               fs_randomfail_lock,
-               fs_randomfail_unlock,
-               fs_randomfail_exists,
-               fs_randomfail_stat,
-               fs_randomfail_copy,
-               fs_randomfail_rename,
-               fs_randomfail_delete,
-               fs_randomfail_iter_alloc,
-               fs_randomfail_iter_init,
-               fs_randomfail_iter_next,
-               fs_randomfail_iter_deinit,
-               NULL,
-               fs_randomfail_get_nlinks,
+               .alloc = fs_randomfail_alloc,
+               .init = fs_randomfail_init,
+               .deinit = NULL,
+               .free = fs_randomfail_free,
+               .get_properties = fs_randomfail_get_properties,
+               .file_alloc = fs_randomfail_file_alloc,
+               .file_init = fs_randomfail_file_init,
+               .file_deinit = fs_randomfail_file_deinit,
+               .file_close = fs_wrapper_file_close,
+               .get_path = fs_wrapper_file_get_path,
+               .set_async_callback = fs_wrapper_set_async_callback,
+               .wait_async = fs_wrapper_wait_async,
+               .set_metadata = fs_wrapper_set_metadata,
+               .get_metadata = fs_randomfail_get_metadata,
+               .prefetch = fs_randomfail_prefetch,
+               .read = fs_randomfail_read,
+               .read_stream = fs_randomfail_read_stream,
+               .write = fs_randomfail_write,
+               .write_stream = fs_randomfail_write_stream,
+               .write_stream_finish = fs_randomfail_write_stream_finish,
+               .lock = fs_randomfail_lock,
+               .unlock = fs_randomfail_unlock,
+               .exists = fs_randomfail_exists,
+               .stat = fs_randomfail_stat,
+               .copy = fs_randomfail_copy,
+               .rename = fs_randomfail_rename,
+               .delete_file = fs_randomfail_delete,
+               .iter_alloc = fs_randomfail_iter_alloc,
+               .iter_init = fs_randomfail_iter_init,
+               .iter_next = fs_randomfail_iter_next,
+               .iter_deinit = fs_randomfail_iter_deinit,
+               .switch_ioloop = NULL,
+               .get_nlinks = fs_randomfail_get_nlinks,
        }
 };

diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index d1be57d31c9b013b8129aa67b1f61c5ab50fe43a..24ca442f9396a075abe31764fcebffcf9b0544de 100644 (file)
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -171,38 +171,38 @@ static int fs_sis_queue_delete(struct fs_file *_file)
 const struct fs fs_class_sis_queue = {
        .name = "sis-queue",
        .v = {
-               fs_sis_queue_alloc,
-               fs_sis_queue_init,
-               NULL,
-               fs_sis_queue_free,
-               fs_wrapper_get_properties,
-               fs_sis_queue_file_alloc,
-               fs_sis_queue_file_init,
-               fs_sis_queue_file_deinit,
-               fs_wrapper_file_close,
-               fs_wrapper_file_get_path,
-               fs_wrapper_set_async_callback,
-               fs_wrapper_wait_async,
-               fs_wrapper_set_metadata,
-               fs_wrapper_get_metadata,
-               fs_wrapper_prefetch,
-               fs_wrapper_read,
-               fs_wrapper_read_stream,
-               fs_sis_queue_write,
-               fs_sis_queue_write_stream,
-               fs_sis_queue_write_stream_finish,
-               fs_wrapper_lock,
-               fs_wrapper_unlock,
-               fs_wrapper_exists,
-               fs_wrapper_stat,
-               fs_wrapper_copy,
-               fs_wrapper_rename,
-               fs_sis_queue_delete,
-               fs_wrapper_iter_alloc,
-               fs_wrapper_iter_init,
-               NULL,
-               NULL,
-               NULL,
-               fs_wrapper_get_nlinks,
+               .alloc = fs_sis_queue_alloc,
+               .init = fs_sis_queue_init,
+               .deinit = NULL,
+               .free = fs_sis_queue_free,
+               .get_properties = fs_wrapper_get_properties,
+               .file_alloc = fs_sis_queue_file_alloc,
+               .file_init = fs_sis_queue_file_init,
+               .file_deinit = fs_sis_queue_file_deinit,
+               .file_close = fs_wrapper_file_close,
+               .get_path = fs_wrapper_file_get_path,
+               .set_async_callback = fs_wrapper_set_async_callback,
+               .wait_async = fs_wrapper_wait_async,
+               .set_metadata = fs_wrapper_set_metadata,
+               .get_metadata = fs_wrapper_get_metadata,
+               .prefetch = fs_wrapper_prefetch,
+               .read = fs_wrapper_read,
+               .read_stream = fs_wrapper_read_stream,
+               .write = fs_sis_queue_write,
+               .write_stream = fs_sis_queue_write_stream,
+               .write_stream_finish = fs_sis_queue_write_stream_finish,
+               .lock = fs_wrapper_lock,
+               .unlock = fs_wrapper_unlock,
+               .exists = fs_wrapper_exists,
+               .stat = fs_wrapper_stat,
+               .copy = fs_wrapper_copy,
+               .rename = fs_wrapper_rename,
+               .delete_file = fs_sis_queue_delete,
+               .iter_alloc = fs_wrapper_iter_alloc,
+               .iter_init = fs_wrapper_iter_init,
+               .iter_next = NULL,
+               .iter_deinit = NULL,
+               .switch_ioloop = NULL,
+               .get_nlinks = fs_wrapper_get_nlinks,
        }
 };

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index 6a020bcbc736a13e1fd3e3bc4610a01a49431ba0..c955342ab6397052d65cc55dc76c84999d5720b2 100644 (file)
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -332,38 +332,38 @@ static int fs_sis_delete(struct fs_file *_file)
 const struct fs fs_class_sis = {
        .name = "sis",
        .v = {
-               fs_sis_alloc,
-               fs_sis_init,
-               NULL,
-               fs_sis_free,
-               fs_wrapper_get_properties,
-               fs_sis_file_alloc,
-               fs_sis_file_init,
-               fs_sis_file_deinit,
-               fs_sis_file_close,
-               fs_wrapper_file_get_path,
-               fs_wrapper_set_async_callback,
-               fs_wrapper_wait_async,
-               fs_wrapper_set_metadata,
-               fs_wrapper_get_metadata,
-               fs_wrapper_prefetch,
-               fs_wrapper_read,
-               fs_wrapper_read_stream,
-               fs_sis_write,
-               fs_sis_write_stream,
-               fs_sis_write_stream_finish,
-               fs_wrapper_lock,
-               fs_wrapper_unlock,
-               fs_wrapper_exists,
-               fs_wrapper_stat,
-               fs_wrapper_copy,
-               fs_wrapper_rename,
-               fs_sis_delete,
-               fs_wrapper_iter_alloc,
-               fs_wrapper_iter_init,
-               NULL,
-               NULL,
-               NULL,
-               fs_wrapper_get_nlinks,
+               .alloc = fs_sis_alloc,
+               .init = fs_sis_init,
+               .deinit = NULL,
+               .free = fs_sis_free,
+               .get_properties = fs_wrapper_get_properties,
+               .file_alloc = fs_sis_file_alloc,
+               .file_init = fs_sis_file_init,
+               .file_deinit = fs_sis_file_deinit,
+               .file_close = fs_sis_file_close,
+               .get_path = fs_wrapper_file_get_path,
+               .set_async_callback = fs_wrapper_set_async_callback,
+               .wait_async = fs_wrapper_wait_async,
+               .set_metadata = fs_wrapper_set_metadata,
+               .get_metadata = fs_wrapper_get_metadata,
+               .prefetch = fs_wrapper_prefetch,
+               .read = fs_wrapper_read,
+               .read_stream = fs_wrapper_read_stream,
+               .write = fs_sis_write,
+               .write_stream = fs_sis_write_stream,
+               .write_stream_finish = fs_sis_write_stream_finish,
+               .lock = fs_wrapper_lock,
+               .unlock = fs_wrapper_unlock,
+               .exists = fs_wrapper_exists,
+               .stat = fs_wrapper_stat,
+               .copy = fs_wrapper_copy,
+               .rename = fs_wrapper_rename,
+               .delete_file = fs_sis_delete,
+               .iter_alloc = fs_wrapper_iter_alloc,
+               .iter_init = fs_wrapper_iter_init,
+               .iter_next = NULL,
+               .iter_deinit = NULL,
+               .switch_ioloop = NULL,
+               .get_nlinks = fs_wrapper_get_nlinks,
        }
 };

diff --git a/src/lib-fs/fs-test.c b/src/lib-fs/fs-test.c
index d35271828b7a099ae4b29c3f92a373c4c208e0cf..9e097a3bfe762c9df84bce99c4290a34f7714344 100644 (file)
--- a/src/lib-fs/fs-test.c
+++ b/src/lib-fs/fs-test.c
@@ -406,38 +406,38 @@ struct test_fs_file *test_fs_file_get(struct fs *fs, const char *path)
 const struct fs fs_class_test = {
        .name = "test",
        .v = {
-               fs_test_alloc,
-               fs_test_init,
-               NULL,
-               fs_test_free,
-               fs_test_get_properties,
-               fs_test_file_alloc,
-               fs_test_file_init,
-               fs_test_file_deinit,
-               fs_test_file_close,
-               fs_test_file_get_path,
-               fs_test_set_async_callback,
-               fs_test_wait_async,
-               fs_test_set_metadata,
-               fs_test_get_metadata,
-               fs_test_prefetch,
-               NULL,
-               fs_test_read_stream,
-               NULL,
-               fs_test_write_stream,
-               fs_test_write_stream_finish,
-               fs_test_lock,
-               fs_test_unlock,
-               fs_test_exists,
-               fs_test_stat,
-               fs_test_copy,
-               fs_test_rename,
-               fs_test_delete,
-               fs_test_iter_alloc,
-               fs_test_iter_init,
-               fs_test_iter_next,
-               fs_test_iter_deinit,
-               NULL,
-               NULL,
+               .alloc = fs_test_alloc,
+               .init = fs_test_init,
+               .deinit = NULL,
+               .free = fs_test_free,
+               .get_properties = fs_test_get_properties,
+               .file_alloc = fs_test_file_alloc,
+               .file_init = fs_test_file_init,
+               .file_deinit = fs_test_file_deinit,
+               .file_close = fs_test_file_close,
+               .get_path = fs_test_file_get_path,
+               .set_async_callback = fs_test_set_async_callback,
+               .wait_async = fs_test_wait_async,
+               .set_metadata = fs_test_set_metadata,
+               .get_metadata = fs_test_get_metadata,
+               .prefetch = fs_test_prefetch,
+               .read = NULL,
+               .read_stream = fs_test_read_stream,
+               .write = NULL,
+               .write_stream = fs_test_write_stream,
+               .write_stream_finish = fs_test_write_stream_finish,
+               .lock = fs_test_lock,
+               .unlock = fs_test_unlock,
+               .exists = fs_test_exists,
+               .stat = fs_test_stat,
+               .copy = fs_test_copy,
+               .rename = fs_test_rename,
+               .delete_file = fs_test_delete,
+               .iter_alloc = fs_test_iter_alloc,
+               .iter_init = fs_test_iter_init,
+               .iter_next = fs_test_iter_next,
+               .iter_deinit = fs_test_iter_deinit,
+               .switch_ioloop = NULL,
+               .get_nlinks = NULL,
        }
 };