From a384b1fccb51884e8afe0f571420961851a2149d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 17 May 2017 18:13:09 +0300 Subject: [PATCH] lib-storage: Explicitly name function pointers in mailbox lists This allows adding more fields to struct mailbox_list_vfuncs without compiler warnings. --- src/lib-storage/index/imapc/imapc-list.c | 40 ++++----- src/lib-storage/index/shared/shared-list.c | 42 +++++----- src/lib-storage/list/mailbox-list-fs.c | 42 +++++----- .../list/mailbox-list-index-backend.c | 41 ++++------ src/lib-storage/list/mailbox-list-maildir.c | 82 ++++++++----------- src/lib-storage/list/mailbox-list-none.c | 41 ++++------ 6 files changed, 128 insertions(+), 160 deletions(-) diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c index 66fc8cf478..67d600d4f6 100644 --- a/src/lib-storage/index/imapc/imapc-list.c +++ b/src/lib-storage/index/imapc/imapc-list.c @@ -964,27 +964,23 @@ struct mailbox_list imapc_mailbox_list = { .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, .v = { - imapc_list_alloc, - imapc_list_init, - imapc_list_deinit, - NULL, - imapc_list_get_hierarchy_sep, - imapc_list_get_vname, - imapc_list_get_storage_name, - imapc_list_get_path, - imapc_list_get_temp_prefix, - imapc_list_join_refpattern, - imapc_list_iter_init, - imapc_list_iter_next, - imapc_list_iter_deinit, - NULL, - NULL, - imapc_list_subscriptions_refresh, - imapc_list_set_subscribed, - imapc_list_delete_mailbox, - imapc_list_delete_dir, - imapc_list_delete_symlink, - imapc_list_rename_mailbox, - NULL, NULL, NULL, NULL + .alloc = imapc_list_alloc, + .init = imapc_list_init, + .deinit = imapc_list_deinit, + .get_hierarchy_sep = imapc_list_get_hierarchy_sep, + .get_vname = imapc_list_get_vname, + .get_storage_name = imapc_list_get_storage_name, + .get_path = imapc_list_get_path, + .get_temp_prefix = imapc_list_get_temp_prefix, + .join_refpattern = imapc_list_join_refpattern, + .iter_init = imapc_list_iter_init, + .iter_next = imapc_list_iter_next, + .iter_deinit = imapc_list_iter_deinit, + .subscriptions_refresh = imapc_list_subscriptions_refresh, + .set_subscribed = imapc_list_set_subscribed, + .delete_mailbox = imapc_list_delete_mailbox, + .delete_dir = imapc_list_delete_dir, + .delete_symlink = imapc_list_delete_symlink, + .rename_mailbox = imapc_list_rename_mailbox, } }; diff --git a/src/lib-storage/index/shared/shared-list.c b/src/lib-storage/index/shared/shared-list.c index b9352751e3..b0deb7b640 100644 --- a/src/lib-storage/index/shared/shared-list.c +++ b/src/lib-storage/index/shared/shared-list.c @@ -288,28 +288,24 @@ struct mailbox_list shared_mailbox_list = { .props = 0, .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, - { - shared_list_alloc, - NULL, - shared_list_deinit, - shared_get_storage, - shared_list_get_hierarchy_sep, - mailbox_list_default_get_vname, - mailbox_list_default_get_storage_name, - shared_list_get_path, - shared_list_get_temp_prefix, - shared_list_join_refpattern, - shared_list_iter_init, - shared_list_iter_next, - shared_list_iter_deinit, - NULL, - NULL, - shared_list_subscriptions_refresh, - shared_list_set_subscribed, - shared_list_delete_mailbox, - shared_list_delete_dir, - shared_list_delete_symlink, - shared_list_rename_mailbox, - NULL, NULL, NULL, NULL + .v = { + .alloc = shared_list_alloc, + .deinit = shared_list_deinit, + .get_storage = shared_get_storage, + .get_hierarchy_sep = shared_list_get_hierarchy_sep, + .get_vname = mailbox_list_default_get_vname, + .get_storage_name = mailbox_list_default_get_storage_name, + .get_path = shared_list_get_path, + .get_temp_prefix = shared_list_get_temp_prefix, + .join_refpattern = shared_list_join_refpattern, + .iter_init = shared_list_iter_init, + .iter_next = shared_list_iter_next, + .iter_deinit = shared_list_iter_deinit, + .subscriptions_refresh = shared_list_subscriptions_refresh, + .set_subscribed = shared_list_set_subscribed, + .delete_mailbox = shared_list_delete_mailbox, + .delete_dir = shared_list_delete_dir, + .delete_symlink = shared_list_delete_symlink, + .rename_mailbox = shared_list_rename_mailbox, } }; diff --git a/src/lib-storage/list/mailbox-list-fs.c b/src/lib-storage/list/mailbox-list-fs.c index 9ed0c95e04..1dd5a34f70 100644 --- a/src/lib-storage/list/mailbox-list-fs.c +++ b/src/lib-storage/list/mailbox-list-fs.c @@ -504,28 +504,24 @@ struct mailbox_list fs_mailbox_list = { .props = 0, .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, - { - fs_list_alloc, - NULL, - fs_list_deinit, - NULL, - fs_list_get_hierarchy_sep, - mailbox_list_default_get_vname, - mailbox_list_default_get_storage_name, - fs_list_get_path, - fs_list_get_temp_prefix, - fs_list_join_refpattern, - fs_list_iter_init, - fs_list_iter_next, - fs_list_iter_deinit, - fs_list_get_mailbox_flags, - NULL, - mailbox_list_subscriptions_refresh, - fs_list_set_subscribed, - fs_list_delete_mailbox, - fs_list_delete_dir, - mailbox_list_delete_symlink_default, - fs_list_rename_mailbox, - NULL, NULL, NULL, NULL + .v = { + .alloc = fs_list_alloc, + .deinit = fs_list_deinit, + .get_hierarchy_sep = fs_list_get_hierarchy_sep, + .get_vname = mailbox_list_default_get_vname, + .get_storage_name = mailbox_list_default_get_storage_name, + .get_path = fs_list_get_path, + .get_temp_prefix = fs_list_get_temp_prefix, + .join_refpattern = fs_list_join_refpattern, + .iter_init = fs_list_iter_init, + .iter_next = fs_list_iter_next, + .iter_deinit = fs_list_iter_deinit, + .get_mailbox_flags = fs_list_get_mailbox_flags, + .subscriptions_refresh = mailbox_list_subscriptions_refresh, + .set_subscribed = fs_list_set_subscribed, + .delete_mailbox = fs_list_delete_mailbox, + .delete_dir = fs_list_delete_dir, + .delete_symlink = mailbox_list_delete_symlink_default, + .rename_mailbox = fs_list_rename_mailbox, } }; diff --git a/src/lib-storage/list/mailbox-list-index-backend.c b/src/lib-storage/list/mailbox-list-index-backend.c index 23bd2f639c..522f48f57f 100644 --- a/src/lib-storage/list/mailbox-list-index-backend.c +++ b/src/lib-storage/list/mailbox-list-index-backend.c @@ -823,29 +823,24 @@ struct mailbox_list index_mailbox_list = { .props = MAILBOX_LIST_PROP_NO_ROOT, .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, - { - index_list_alloc, - index_list_init, - index_list_deinit, - NULL, - index_list_get_hierarchy_sep, - mailbox_list_default_get_vname, - mailbox_list_default_get_storage_name, - index_list_get_path, - index_list_get_temp_prefix, - NULL, - index_list_iter_init, - index_list_iter_next, - index_list_iter_deinit, - NULL, - NULL, - mailbox_list_subscriptions_refresh, - index_list_set_subscribed, - index_list_delete_mailbox, - index_list_delete_dir, - index_list_delete_symlink, - index_list_rename_mailbox, - NULL, NULL, NULL, NULL + .v = { + .alloc = index_list_alloc, + .init = index_list_init, + .deinit = index_list_deinit, + .get_hierarchy_sep = index_list_get_hierarchy_sep, + .get_vname = mailbox_list_default_get_vname, + .get_storage_name = mailbox_list_default_get_storage_name, + .get_path = index_list_get_path, + .get_temp_prefix = index_list_get_temp_prefix, + .iter_init = index_list_iter_init, + .iter_next = index_list_iter_next, + .iter_deinit = index_list_iter_deinit, + .subscriptions_refresh = mailbox_list_subscriptions_refresh, + .set_subscribed = index_list_set_subscribed, + .delete_mailbox = index_list_delete_mailbox, + .delete_dir = index_list_delete_dir, + .delete_symlink = index_list_delete_symlink, + .rename_mailbox = index_list_rename_mailbox, } }; diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c index 0abc36d5c2..d61404ece9 100644 --- a/src/lib-storage/list/mailbox-list-maildir.c +++ b/src/lib-storage/list/mailbox-list-maildir.c @@ -482,29 +482,24 @@ struct mailbox_list maildir_mailbox_list = { MAILBOX_LIST_PROP_NO_NOSELECT, .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, - { - maildir_list_alloc, - NULL, - maildir_list_deinit, - NULL, - maildir_list_get_hierarchy_sep, - mailbox_list_default_get_vname, - mailbox_list_default_get_storage_name, - maildir_list_get_path, - maildir_list_get_temp_prefix, - NULL, - maildir_list_iter_init, - maildir_list_iter_next, - maildir_list_iter_deinit, - maildir_list_get_mailbox_flags, - NULL, - mailbox_list_subscriptions_refresh, - maildir_list_set_subscribed, - maildir_list_delete_mailbox, - maildir_list_delete_dir, - mailbox_list_delete_symlink_default, - maildir_list_rename_mailbox, - NULL, NULL, NULL, NULL + .v = { + .alloc = maildir_list_alloc, + .deinit = maildir_list_deinit, + .get_hierarchy_sep = maildir_list_get_hierarchy_sep, + .get_vname = mailbox_list_default_get_vname, + .get_storage_name = mailbox_list_default_get_storage_name, + .get_path = maildir_list_get_path, + .get_temp_prefix = maildir_list_get_temp_prefix, + .iter_init = maildir_list_iter_init, + .iter_next = maildir_list_iter_next, + .iter_deinit = maildir_list_iter_deinit, + .get_mailbox_flags = maildir_list_get_mailbox_flags, + .subscriptions_refresh = mailbox_list_subscriptions_refresh, + .set_subscribed = maildir_list_set_subscribed, + .delete_mailbox = maildir_list_delete_mailbox, + .delete_dir = maildir_list_delete_dir, + .delete_symlink = mailbox_list_delete_symlink_default, + .rename_mailbox = maildir_list_rename_mailbox, } }; @@ -515,28 +510,23 @@ struct mailbox_list imapdir_mailbox_list = { MAILBOX_LIST_PROP_NO_NOSELECT, .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, - { - imapdir_list_alloc, - NULL, - maildir_list_deinit, - NULL, - maildir_list_get_hierarchy_sep, - mailbox_list_default_get_vname, - mailbox_list_default_get_storage_name, - maildir_list_get_path, - maildir_list_get_temp_prefix, - NULL, - maildir_list_iter_init, - maildir_list_iter_next, - maildir_list_iter_deinit, - maildir_list_get_mailbox_flags, - NULL, - mailbox_list_subscriptions_refresh, - maildir_list_set_subscribed, - maildir_list_delete_mailbox, - maildir_list_delete_dir, - mailbox_list_delete_symlink_default, - maildir_list_rename_mailbox, - NULL, NULL, NULL, NULL + .v = { + .alloc = imapdir_list_alloc, + .deinit = maildir_list_deinit, + .get_hierarchy_sep = maildir_list_get_hierarchy_sep, + .get_vname = mailbox_list_default_get_vname, + .get_storage_name = mailbox_list_default_get_storage_name, + .get_path = maildir_list_get_path, + .get_temp_prefix = maildir_list_get_temp_prefix, + .iter_init = maildir_list_iter_init, + .iter_next = maildir_list_iter_next, + .iter_deinit = maildir_list_iter_deinit, + .get_mailbox_flags = maildir_list_get_mailbox_flags, + .subscriptions_refresh = mailbox_list_subscriptions_refresh, + .set_subscribed = maildir_list_set_subscribed, + .delete_mailbox = maildir_list_delete_mailbox, + .delete_dir = maildir_list_delete_dir, + .delete_symlink = mailbox_list_delete_symlink_default, + .rename_mailbox = maildir_list_rename_mailbox, } }; diff --git a/src/lib-storage/list/mailbox-list-none.c b/src/lib-storage/list/mailbox-list-none.c index aaf21ed9c7..5137e0160b 100644 --- a/src/lib-storage/list/mailbox-list-none.c +++ b/src/lib-storage/list/mailbox-list-none.c @@ -155,28 +155,23 @@ struct mailbox_list none_mailbox_list = { .props = MAILBOX_LIST_PROP_NO_ROOT, .mailbox_name_max_length = MAILBOX_LIST_NAME_MAX_LENGTH, - { - none_list_alloc, - NULL, - none_list_deinit, - NULL, - none_list_get_hierarchy_sep, - mailbox_list_default_get_vname, - mailbox_list_default_get_storage_name, - none_list_get_path, - none_list_get_temp_prefix, - NULL, - none_list_iter_init, - none_list_iter_next, - none_list_iter_deinit, - none_list_get_mailbox_flags, - NULL, - none_list_subscriptions_refresh, - none_list_set_subscribed, - none_list_delete_mailbox, - none_list_delete_dir, - none_list_delete_dir, - none_list_rename_mailbox, - NULL, NULL, NULL, NULL + .v = { + .alloc = none_list_alloc, + .deinit = none_list_deinit, + .get_hierarchy_sep = none_list_get_hierarchy_sep, + .get_vname = mailbox_list_default_get_vname, + .get_storage_name = mailbox_list_default_get_storage_name, + .get_path = none_list_get_path, + .get_temp_prefix = none_list_get_temp_prefix, + .iter_init = none_list_iter_init, + .iter_next = none_list_iter_next, + .iter_deinit = none_list_iter_deinit, + .get_mailbox_flags = none_list_get_mailbox_flags, + .subscriptions_refresh = none_list_subscriptions_refresh, + .set_subscribed = none_list_set_subscribed, + .delete_mailbox = none_list_delete_mailbox, + .delete_dir = none_list_delete_dir, + .delete_symlink = none_list_delete_dir, + .rename_mailbox = none_list_rename_mailbox, } }; -- 2.47.3