From: Timo Sirainen Date: Tue, 18 Apr 2023 10:50:26 +0000 (+0300) Subject: lib-storage: Remove unused mail_user.set_instance X-Git-Tag: 2.4.0~2178 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa7fc0b037c685f0dfbc806a855a9b509723f5f2;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Remove unused mail_user.set_instance --- diff --git a/src/lib-storage/index/raw/raw-storage.h b/src/lib-storage/index/raw/raw-storage.h index 70fe423c7c..36f71df4cd 100644 --- a/src/lib-storage/index/raw/raw-storage.h +++ b/src/lib-storage/index/raw/raw-storage.h @@ -4,6 +4,7 @@ #include "index-storage.h" struct setting_parser_context; +struct master_service_settings_instance; struct mail_storage_service_ctx; #define RAW_STORAGE_NAME "raw" diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c index 0e3b556046..019bb610b2 100644 --- a/src/lib-storage/mail-user.c +++ b/src/lib-storage/mail-user.c @@ -83,8 +83,6 @@ mail_user_alloc(struct mail_storage_service_user *service_user) mail_storage_service_user_get_event(service_user); const char *username = mail_storage_service_user_get_username(service_user); - struct master_service_settings_instance *service_user_set_instance = - mail_storage_service_user_get_settings_instance(service_user); i_assert(*username != '\0'); pool_t pool = pool_alloconly_create(MEMPOOL_GROWING"mail user", 16*1024); @@ -94,7 +92,6 @@ mail_user_alloc(struct mail_storage_service_user *service_user) user->service_user = service_user; mail_storage_service_user_ref(service_user); user->username = p_strdup(pool, username); - user->set_instance = service_user_set_instance; user->set = mail_storage_service_user_get_set(service_user); user->service = master_service_get_name(master_service); user->default_normalizer = uni_utf8_to_decomposed_titlecase; diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h index cddf8ec893..634bbf461e 100644 --- a/src/lib-storage/mail-user.h +++ b/src/lib-storage/mail-user.h @@ -57,8 +57,6 @@ struct mail_user { This could be set by plugins that need to fail the initialization. */ const char *error; - /* Points to service_user->set_instance */ - struct master_service_settings_instance *set_instance; const struct mail_user_settings *set; struct mail_storage_settings *_mail_set; struct ssl_iostream_settings *ssl_set;