From: Timo Sirainen Date: Wed, 4 Jan 2023 21:37:36 +0000 (+0200) Subject: lib-settings, global: setting_parser_info.type_offset and parent_offset - use 0 as... X-Git-Tag: 2.4.0~2345 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d537238209334011df9b7ae67212eb24727ee6d7;p=thirdparty%2Fdovecot%2Fcore.git lib-settings, global: setting_parser_info.type_offset and parent_offset - use 0 as nonexistent Rename them to type_offset1 and parent_offset1. The offset must add +1, so 0 value now means nonexistent. This simplifies the structs, since most of them don't use these. --- diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c index 44f7b55860..ce1365e0fb 100644 --- a/src/auth/auth-settings.c +++ b/src/auth/auth-settings.c @@ -194,10 +194,8 @@ const struct setting_parser_info auth_passdb_setting_parser_info = { .defines = auth_passdb_setting_defines, .defaults = &auth_passdb_default_settings, - .type_offset = offsetof(struct auth_passdb_settings, name), + .type_offset1 = 1 + offsetof(struct auth_passdb_settings, name), .struct_size = sizeof(struct auth_passdb_settings), - - .parent_offset = SIZE_MAX, .parent = &auth_setting_parser_info, .check_func = auth_passdb_settings_check @@ -244,12 +242,9 @@ const struct setting_parser_info auth_userdb_setting_parser_info = { .defines = auth_userdb_setting_defines, .defaults = &auth_userdb_default_settings, - .type_offset = offsetof(struct auth_userdb_settings, name), + .type_offset1 = 1 + offsetof(struct auth_userdb_settings, name), .struct_size = sizeof(struct auth_userdb_settings), - - .parent_offset = SIZE_MAX, .parent = &auth_setting_parser_info, - .check_func = auth_userdb_settings_check }; @@ -383,11 +378,7 @@ const struct setting_parser_info auth_setting_parser_info = { .defines = auth_setting_defines, .defaults = &auth_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct auth_settings), - - .parent_offset = SIZE_MAX, - .check_func = auth_settings_check }; diff --git a/src/config/config-parser.c b/src/config/config-parser.c index eb8ed181fe..a1a15beb41 100644 --- a/src/config/config-parser.c +++ b/src/config/config-parser.c @@ -52,10 +52,10 @@ static const char *info_type_name_find(const struct setting_parser_info *info) unsigned int i; for (i = 0; info->defines[i].key != NULL; i++) { - if (info->defines[i].offset == info->type_offset) + if (info->defines[i].offset + 1 == info->type_offset1) return info->defines[i].key; } - i_panic("setting parser: Invalid type_offset value"); + i_panic("setting parser: Invalid type_offset1 value"); return NULL; } @@ -72,7 +72,7 @@ static int config_add_type(struct setting_parser_context *parser, /* section inside strlist */ return -1; } - if (info->type_offset == SIZE_MAX) + if (info->type_offset1 == 0) return 0; str = t_str_new(256); diff --git a/src/config/config-request.c b/src/config/config-request.c index 1bef31192b..9c6516a113 100644 --- a/src/config/config-request.c +++ b/src/config/config-request.c @@ -192,17 +192,17 @@ setting_export_section_name(string_t *str, const struct setting_define *def, const void *set, unsigned int idx) { const char *const *name; - size_t name_offset; + size_t name_offset1; if (def->type != SET_DEFLIST_UNIQUE) { /* not unique, use the index */ str_printfa(str, "%u", idx); return; } - name_offset = def->list_info->type_offset; - i_assert(name_offset != SIZE_MAX); + name_offset1 = def->list_info->type_offset1; + i_assert(name_offset1 != 0); - name = CONST_PTR_OFFSET(set, name_offset); + name = CONST_PTR_OFFSET(set, name_offset1 - 1); if (*name == NULL || **name == '\0') { /* no name, this one isn't unique. use the index. */ str_printfa(str, "%u", idx); @@ -254,7 +254,7 @@ settings_export(struct config_export_context *ctx, (ctx->flags & CONFIG_DUMP_FLAG_HIDE_LIST_DEFAULTS) == 0) { /* .. */ } else if (*((const char *)change_value) == 0 && - def->offset != info->type_offset) { + def->offset + 1 != info->type_offset1) { /* this is mainly for service {} blocks. if value hasn't changed, it's the default. even if info->defaults has a different value. */ @@ -344,7 +344,7 @@ settings_export(struct config_export_context *ctx, if (hash_table_lookup(ctx->keys, key) == NULL) { enum config_key_type type; - if (def->offset == info->type_offset && + if (def->offset + 1 == info->type_offset1 && parent_unique_deflist) type = CONFIG_KEY_UNIQUE_KEY; else if (SETTING_TYPE_IS_DEFLIST(def->type)) diff --git a/src/config/test-config-parser.c b/src/config/test-config-parser.c index a10e29cee0..12f1233182 100644 --- a/src/config/test-config-parser.c +++ b/src/config/test-config-parser.c @@ -65,10 +65,7 @@ const struct setting_parser_info test_settings_root = { .defines = test_settings_defs, .defaults = &test_settings_defaults, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct test_settings), - - .parent_offset = SIZE_MAX, .parent = NULL, }; diff --git a/src/dict/dict-settings.c b/src/dict/dict-settings.c index 4835ae739b..0361a642e8 100644 --- a/src/dict/dict-settings.c +++ b/src/dict/dict-settings.c @@ -139,10 +139,7 @@ const struct setting_parser_info dict_setting_parser_info = { .defines = dict_setting_defines, .defaults = &dict_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct dict_server_settings), - - .parent_offset = SIZE_MAX }; const struct dict_server_settings *dict_settings; diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 08c8281aa7..d2f85f2ac4 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -134,10 +134,7 @@ const struct setting_parser_info doveadm_setting_parser_info = { .defines = doveadm_setting_defines, .defaults = &doveadm_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct doveadm_settings), - - .parent_offset = SIZE_MAX, .check_func = doveadm_settings_check, .dependencies = doveadm_setting_dependencies }; diff --git a/src/imap-login/imap-login-settings.c b/src/imap-login/imap-login-settings.c index a24c9eb26f..d12e4a82b8 100644 --- a/src/imap-login/imap-login-settings.c +++ b/src/imap-login/imap-login-settings.c @@ -105,10 +105,7 @@ static const struct setting_parser_info imap_login_setting_parser_info = { .defines = imap_login_setting_defines, .defaults = &imap_login_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct imap_login_settings), - - .parent_offset = SIZE_MAX, .dependencies = imap_login_setting_dependencies }; diff --git a/src/imap-urlauth-login/imap-urlauth-login-settings.c b/src/imap-urlauth-login/imap-urlauth-login-settings.c index 552d6ecd4f..7167a332c1 100644 --- a/src/imap-urlauth-login/imap-urlauth-login-settings.c +++ b/src/imap-urlauth-login/imap-urlauth-login-settings.c @@ -67,9 +67,6 @@ const struct setting_parser_info imap_urlauth_login_setting_parser_info = { .module_name = "imap-urlauth-login", .defines = imap_urlauth_login_setting_defines, - .type_offset = SIZE_MAX, - .parent_offset = SIZE_MAX, - .dependencies = imap_urlauth_login_setting_dependencies }; diff --git a/src/imap-urlauth/imap-urlauth-settings.c b/src/imap-urlauth/imap-urlauth-settings.c index 6787cc5403..a843b235f4 100644 --- a/src/imap-urlauth/imap-urlauth-settings.c +++ b/src/imap-urlauth/imap-urlauth-settings.c @@ -90,10 +90,6 @@ const struct setting_parser_info imap_urlauth_setting_parser_info = { .defines = imap_urlauth_setting_defines, .defaults = &imap_urlauth_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct imap_urlauth_settings), - - .parent_offset = SIZE_MAX, - .dependencies = imap_urlauth_setting_dependencies }; diff --git a/src/imap-urlauth/imap-urlauth-worker-settings.c b/src/imap-urlauth/imap-urlauth-worker-settings.c index e7d997b75b..11ffa0b1c5 100644 --- a/src/imap-urlauth/imap-urlauth-worker-settings.c +++ b/src/imap-urlauth/imap-urlauth-worker-settings.c @@ -85,10 +85,6 @@ const struct setting_parser_info imap_urlauth_worker_setting_parser_info = { .defines = imap_urlauth_worker_setting_defines, .defaults = &imap_urlauth_worker_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct imap_urlauth_worker_settings), - - .parent_offset = SIZE_MAX, - .dependencies = imap_urlauth_worker_setting_dependencies }; diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c index ea9c5dc6a5..71c880642f 100644 --- a/src/imap/imap-settings.c +++ b/src/imap/imap-settings.c @@ -141,11 +141,7 @@ const struct setting_parser_info imap_setting_parser_info = { .defines = imap_setting_defines, .defaults = &imap_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct imap_settings), - - .parent_offset = SIZE_MAX, - .check_func = imap_settings_verify, .dependencies = imap_setting_dependencies }; diff --git a/src/lib-lda/lda-settings.c b/src/lib-lda/lda-settings.c index 1bb02f8ff3..1a92b9d095 100644 --- a/src/lib-lda/lda-settings.c +++ b/src/lib-lda/lda-settings.c @@ -58,11 +58,7 @@ const struct setting_parser_info lda_setting_parser_info = { .defines = lda_setting_defines, .defaults = &lda_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct lda_settings), - - .parent_offset = SIZE_MAX, - #ifndef CONFIG_BINARY .check_func = lda_settings_check, #endif diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c index 742dfff64f..7791155c3b 100644 --- a/src/lib-master/master-service-settings.c +++ b/src/lib-master/master-service-settings.c @@ -110,10 +110,7 @@ const struct setting_parser_info master_service_setting_parser_info = { .defines = master_service_setting_defines, .defaults = &master_service_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct master_service_settings), - - .parent_offset = SIZE_MAX, .check_func = master_service_settings_check }; diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c index fcc06169e8..e30ccd8210 100644 --- a/src/lib-master/master-service-ssl-settings.c +++ b/src/lib-master/master-service-ssl-settings.c @@ -64,10 +64,7 @@ const struct setting_parser_info master_service_ssl_setting_parser_info = { .defines = master_service_ssl_setting_defines, .defaults = &master_service_ssl_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct master_service_ssl_settings), - - .parent_offset = SIZE_MAX, .check_func = master_service_ssl_settings_check }; @@ -105,10 +102,7 @@ const struct setting_parser_info master_service_ssl_server_setting_parser_info = .defines = master_service_ssl_server_setting_defines, .defaults = &master_service_ssl_server_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct master_service_ssl_server_settings), - - .parent_offset = SIZE_MAX, .dependencies = master_service_ssl_server_setting_dependencies, }; diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c index 9fea4f08f8..15f4ed708b 100644 --- a/src/lib-settings/settings-parser.c +++ b/src/lib-settings/settings-parser.c @@ -59,10 +59,7 @@ static const struct setting_parser_info strlist_info = { .defines = NULL, .defaults = NULL, - .type_offset = SIZE_MAX, .struct_size = 0, - - .parent_offset = SIZE_MAX }; HASH_TABLE_DEFINE_TYPE(setting_link, struct setting_link *, @@ -124,7 +121,7 @@ copy_unique_defaults(struct setting_parser_context *ctx, array_push_back(carr, &new_changes); } - keyp = CONST_PTR_OFFSET(children[i], info.type_offset); + keyp = CONST_PTR_OFFSET(children[i], info.type_offset1-1); key = settings_section_escape(*keyp); new_link = p_new(ctx->set_pool, struct setting_link, 1); @@ -386,9 +383,9 @@ setting_link_init_set_struct(struct setting_parser_context *ctx, setting_parser_copy_defaults(ctx, link->info, link); array_push_back(link->array, &link->set_struct); - if (link->info->parent_offset != SIZE_MAX && link->parent != NULL) { + if (link->info->parent_offset1 != 0 && link->parent != NULL) { ptr = STRUCT_MEMBER_P(link->set_struct, - link->info->parent_offset); + link->info->parent_offset1-1); *((void **)ptr) = link->parent->set_struct; } } @@ -1023,10 +1020,10 @@ static void settings_set_parent(const struct setting_parser_info *info, { void **ptr; - if (info->parent_offset == SIZE_MAX) + if (info->parent_offset1 == 0) return; - ptr = PTR_OFFSET(child, info->parent_offset); + ptr = PTR_OFFSET(child, info->parent_offset1-1); *ptr = parent; } @@ -1427,7 +1424,7 @@ settings_copy_deflist_unique(const struct setting_define *def, unsigned int i, j, src_count, dest_count, ccount; unsigned int type_offset; - i_assert(def->list_info->type_offset != SIZE_MAX); + i_assert(def->list_info->type_offset1 != 0); src_arr = CONST_PTR_OFFSET(src_link->set_struct, def->offset); src_carr = CONST_PTR_OFFSET(src_link->change_struct, def->offset); @@ -1436,7 +1433,7 @@ settings_copy_deflist_unique(const struct setting_define *def, if (!array_is_created(src_arr)) return 0; - type_offset = def->list_info->type_offset; + type_offset = def->list_info->type_offset1-1; i_zero(&child_dest_link); i_zero(&child_src_link); diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h index 94a2744bca..289ece2f89 100644 --- a/src/lib-settings/settings-parser.h +++ b/src/lib-settings/settings-parser.h @@ -102,10 +102,10 @@ struct setting_parser_info { const struct setting_define *defines; const void *defaults; - size_t type_offset; + size_t type_offset1; /* type_offset+1. 0=nonexistent. */ size_t struct_size; - size_t parent_offset; + size_t parent_offset1; /* parent_offset+1. 0=nonexistent. */ const struct setting_parser_info *parent; bool (*check_func)(void *set, pool_t pool, const char **error_r); diff --git a/src/lib-settings/test-settings-parser.c b/src/lib-settings/test-settings-parser.c index b9f3dbb300..f7c2e83955 100644 --- a/src/lib-settings/test-settings-parser.c +++ b/src/lib-settings/test-settings-parser.c @@ -75,10 +75,7 @@ static void test_settings_parser(void) .defines = defs, .defaults = &test_defaults, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct test_settings), - - .parent_offset = SIZE_MAX, }; test_begin("settings_parser"); diff --git a/src/lib-smtp/smtp-submit-settings.c b/src/lib-smtp/smtp-submit-settings.c index cfe4afd4d0..4c5bfe803b 100644 --- a/src/lib-smtp/smtp-submit-settings.c +++ b/src/lib-smtp/smtp-submit-settings.c @@ -47,11 +47,8 @@ const struct setting_parser_info smtp_submit_setting_parser_info = { .defines = smtp_submit_setting_defines, .defaults = &smtp_submit_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct smtp_submit_settings), - .parent_offset = SIZE_MAX, - #ifndef CONFIG_BINARY .check_func = smtp_submit_settings_check, #endif diff --git a/src/lib-storage/index/dbox-multi/mdbox-settings.c b/src/lib-storage/index/dbox-multi/mdbox-settings.c index dc9e989aa8..5948ce8201 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-settings.c +++ b/src/lib-storage/index/dbox-multi/mdbox-settings.c @@ -30,10 +30,7 @@ static const struct setting_parser_info mdbox_setting_parser_info = { .defines = mdbox_setting_defines, .defaults = &mdbox_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct mdbox_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info }; diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c index aa814093d8..cd3542e6a5 100644 --- a/src/lib-storage/index/imapc/imapc-settings.c +++ b/src/lib-storage/index/imapc/imapc-settings.c @@ -68,10 +68,7 @@ static const struct setting_parser_info imapc_setting_parser_info = { .defines = imapc_setting_defines, .defaults = &imapc_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct imapc_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info, .check_func = imapc_settings_check diff --git a/src/lib-storage/index/maildir/maildir-settings.c b/src/lib-storage/index/maildir/maildir-settings.c index d986d18666..ac4bdcde5d 100644 --- a/src/lib-storage/index/maildir/maildir-settings.c +++ b/src/lib-storage/index/maildir/maildir-settings.c @@ -32,10 +32,7 @@ static const struct setting_parser_info maildir_setting_parser_info = { .defines = maildir_setting_defines, .defaults = &maildir_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct maildir_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info }; diff --git a/src/lib-storage/index/mbox/mbox-settings.c b/src/lib-storage/index/mbox/mbox-settings.c index 1df2452626..3b4bbdd51b 100644 --- a/src/lib-storage/index/mbox/mbox-settings.c +++ b/src/lib-storage/index/mbox/mbox-settings.c @@ -42,10 +42,7 @@ static const struct setting_parser_info mbox_setting_parser_info = { .defines = mbox_setting_defines, .defaults = &mbox_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct mbox_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info }; diff --git a/src/lib-storage/index/pop3c/pop3c-settings.c b/src/lib-storage/index/pop3c/pop3c-settings.c index db876e1205..8a2c189555 100644 --- a/src/lib-storage/index/pop3c/pop3c-settings.c +++ b/src/lib-storage/index/pop3c/pop3c-settings.c @@ -101,10 +101,7 @@ static const struct setting_parser_info pop3c_setting_parser_info = { .defines = pop3c_setting_defines, .defaults = &pop3c_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct pop3c_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info, .check_func = pop3c_settings_check diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index 548f0788cf..9e2546c7ea 100644 --- a/src/lib-storage/mail-storage-settings.c +++ b/src/lib-storage/mail-storage-settings.c @@ -149,12 +149,8 @@ const struct setting_parser_info mail_storage_setting_parser_info = { .defines = mail_storage_setting_defines, .defaults = &mail_storage_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct mail_storage_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info, - .check_func = mail_storage_settings_check, }; @@ -191,10 +187,8 @@ const struct setting_parser_info mailbox_setting_parser_info = { .defines = mailbox_setting_defines, .defaults = &mailbox_default_settings, - .type_offset = offsetof(struct mailbox_settings, name), + .type_offset1 = 1 + offsetof(struct mailbox_settings, name), .struct_size = sizeof(struct mailbox_settings), - - .parent_offset = SIZE_MAX, .parent = &mail_user_setting_parser_info, .check_func = mailbox_settings_check @@ -255,10 +249,10 @@ const struct setting_parser_info mail_namespace_setting_parser_info = { .defines = mail_namespace_setting_defines, .defaults = &mail_namespace_default_settings, - .type_offset = offsetof(struct mail_namespace_settings, name), + .type_offset1 = 1 + offsetof(struct mail_namespace_settings, name), .struct_size = sizeof(struct mail_namespace_settings), - .parent_offset = offsetof(struct mail_namespace_settings, user_set), + .parent_offset1 = 1 + offsetof(struct mail_namespace_settings, user_set), .parent = &mail_user_setting_parser_info, .check_func = namespace_settings_check @@ -341,11 +335,7 @@ const struct setting_parser_info mail_user_setting_parser_info = { .defines = mail_user_setting_defines, .defaults = &mail_user_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct mail_user_settings), - - .parent_offset = SIZE_MAX, - .check_func = mail_user_settings_check, #ifndef CONFIG_BINARY .expand_check_func = mail_user_settings_expand_check, diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c index 3ca3ec0fd3..4f4da459f2 100644 --- a/src/lmtp/lmtp-settings.c +++ b/src/lmtp/lmtp-settings.c @@ -115,11 +115,7 @@ const struct setting_parser_info lmtp_setting_parser_info = { .defines = lmtp_setting_defines, .defaults = &lmtp_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct lmtp_settings), - - .parent_offset = SIZE_MAX, - .check_func = lmtp_settings_check, .dependencies = lmtp_setting_dependencies }; diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c index 0e56d803e6..2f5fdbf037 100644 --- a/src/login-common/login-settings.c +++ b/src/login-common/login-settings.c @@ -81,11 +81,7 @@ const struct setting_parser_info login_setting_parser_info = { .defines = login_setting_defines, .defaults = &login_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct login_settings), - - .parent_offset = SIZE_MAX, - .check_func = login_settings_check }; diff --git a/src/master/master-settings.c b/src/master/master-settings.c index c220107a44..898f9122b3 100644 --- a/src/master/master-settings.c +++ b/src/master/master-settings.c @@ -49,10 +49,8 @@ static const struct setting_parser_info file_listener_setting_parser_info = { .defines = file_listener_setting_defines, .defaults = &file_listener_default_settings, - .type_offset = offsetof(struct file_listener_settings, path), + .type_offset1 = 1 + offsetof(struct file_listener_settings, path), .struct_size = sizeof(struct file_listener_settings), - - .parent_offset = SIZE_MAX, .parent = &service_setting_parser_info }; @@ -85,10 +83,8 @@ static const struct setting_parser_info inet_listener_setting_parser_info = { .defines = inet_listener_setting_defines, .defaults = &inet_listener_default_settings, - .type_offset = offsetof(struct inet_listener_settings, name), + .type_offset1 = 1 + offsetof(struct inet_listener_settings, name), .struct_size = sizeof(struct inet_listener_settings), - - .parent_offset = SIZE_MAX, .parent = &service_setting_parser_info }; @@ -160,10 +156,10 @@ const struct setting_parser_info service_setting_parser_info = { .defines = service_setting_defines, .defaults = &service_default_settings, - .type_offset = offsetof(struct service_settings, name), + .type_offset1 = 1 + offsetof(struct service_settings, name), .struct_size = sizeof(struct service_settings), - .parent_offset = offsetof(struct service_settings, master_set), + .parent_offset1 = 1 + offsetof(struct service_settings, master_set), .parent = &master_setting_parser_info }; @@ -240,11 +236,7 @@ const struct setting_parser_info master_setting_parser_info = { .defines = master_setting_defines, .defaults = &master_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct master_settings), - - .parent_offset = SIZE_MAX, - .check_func = master_settings_verify }; diff --git a/src/plugins/mail-crypt/fs-crypt-settings.c b/src/plugins/mail-crypt/fs-crypt-settings.c index ba70f8a977..2b7293f4b0 100644 --- a/src/plugins/mail-crypt/fs-crypt-settings.c +++ b/src/plugins/mail-crypt/fs-crypt-settings.c @@ -27,9 +27,6 @@ const struct setting_parser_info fs_crypt_setting_parser_info = { .defines = fs_crypt_setting_defines, .defaults = &fs_crypt_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct fs_crypt_settings), - - .parent_offset = SIZE_MAX, .dependencies = fs_crypt_setting_dependencies }; diff --git a/src/plugins/quota/quota-status-settings.c b/src/plugins/quota/quota-status-settings.c index e98cc09cd9..b88314f413 100644 --- a/src/plugins/quota/quota-status-settings.c +++ b/src/plugins/quota/quota-status-settings.c @@ -29,9 +29,6 @@ const struct setting_parser_info quota_status_setting_parser_info = { .defines = quota_status_setting_defines, .defaults = "a_status_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct quota_status_settings), - - .parent_offset = SIZE_MAX, .dependencies = quota_status_setting_dependencies }; diff --git a/src/pop3-login/pop3-login-settings.c b/src/pop3-login/pop3-login-settings.c index 95f4980a41..329c426c2c 100644 --- a/src/pop3-login/pop3-login-settings.c +++ b/src/pop3-login/pop3-login-settings.c @@ -89,9 +89,6 @@ const struct setting_parser_info pop3_login_setting_parser_info = { .module_name = "pop3-login", .defines = pop3_login_setting_defines, - .type_offset = SIZE_MAX, - .parent_offset = SIZE_MAX, - .dependencies = pop3_login_setting_dependencies }; diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c index 488806c185..9c8aa11513 100644 --- a/src/pop3/pop3-settings.c +++ b/src/pop3/pop3-settings.c @@ -119,11 +119,7 @@ const struct setting_parser_info pop3_setting_parser_info = { .defines = pop3_setting_defines, .defaults = &pop3_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct pop3_settings), - - .parent_offset = SIZE_MAX, - .check_func = pop3_settings_verify, .dependencies = pop3_setting_dependencies }; diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c index d00b450f13..e0315e87d5 100644 --- a/src/stats/stats-settings.c +++ b/src/stats/stats-settings.c @@ -106,10 +106,8 @@ const struct setting_parser_info stats_exporter_setting_parser_info = { .defines = stats_exporter_setting_defines, .defaults = &stats_exporter_default_settings, - .type_offset = offsetof(struct stats_exporter_settings, name), + .type_offset1 = 1 + offsetof(struct stats_exporter_settings, name), .struct_size = sizeof(struct stats_exporter_settings), - - .parent_offset = SIZE_MAX, .check_func = stats_exporter_settings_check, }; @@ -146,10 +144,8 @@ const struct setting_parser_info stats_metric_setting_parser_info = { .defines = stats_metric_setting_defines, .defaults = &stats_metric_default_settings, - .type_offset = offsetof(struct stats_metric_settings, metric_name), + .type_offset1 = 1 + offsetof(struct stats_metric_settings, metric_name), .struct_size = sizeof(struct stats_metric_settings), - - .parent_offset = SIZE_MAX, .check_func = stats_metric_settings_check, }; @@ -186,10 +182,7 @@ const struct setting_parser_info stats_setting_parser_info = { .defines = stats_setting_defines, .defaults = &stats_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct stats_settings), - - .parent_offset = SIZE_MAX, .check_func = stats_settings_check, }; diff --git a/src/submission-login/submission-login-settings.c b/src/submission-login/submission-login-settings.c index 705ef7f321..89ba2084b7 100644 --- a/src/submission-login/submission-login-settings.c +++ b/src/submission-login/submission-login-settings.c @@ -112,10 +112,7 @@ const struct setting_parser_info submission_login_setting_parser_info = { .defines = submission_login_setting_defines, .defaults = &submission_login_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct submission_login_settings), - .parent_offset = SIZE_MAX, - .check_func = submission_login_settings_check, .dependencies = submission_login_setting_dependencies }; diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c index 3afa5774b7..8e312916a5 100644 --- a/src/submission/submission-settings.c +++ b/src/submission/submission-settings.c @@ -161,11 +161,7 @@ const struct setting_parser_info submission_setting_parser_info = { .defines = submission_setting_defines, .defaults = &submission_default_settings, - .type_offset = SIZE_MAX, .struct_size = sizeof(struct submission_settings), - - .parent_offset = SIZE_MAX, - .check_func = submission_settings_verify, .dependencies = submission_setting_dependencies };