From 3806f628baf90faff3477d1bf561455966aec847 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Fri, 16 Jul 2010 10:02:20 +0200
Subject: [PATCH] Removed unused code that caused compile failure due to
Dovecot API change.
---
src/lib-sieve-tool/mail-raw.c | 5 -----
src/managesieve/managesieve-capabilities.c | 14 +-------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve-tool/mail-raw.c
index 44c964398..1caf70beb 100644
--- a/src/lib-sieve-tool/mail-raw.c
+++ b/src/lib-sieve-tool/mail-raw.c
@@ -54,8 +54,6 @@ static const char *wanted_headers[] = {
struct mail_raw_user {
struct mail_namespace *ns;;
struct mail_user *mail_user;
-
- char *tmp_prefix;
};
/*
@@ -188,8 +186,6 @@ struct mail_raw_user *mail_raw_user_init
if (mail_storage_create(ruser->ns, "raw", 0, &errstr) < 0)
i_fatal("Couldn't create internal raw storage: %s", errstr);
- ruser->tmp_prefix = i_strdup(mail_user_get_temp_prefix(ruser->mail_user));
-
return ruser;
}
@@ -201,7 +197,6 @@ void mail_raw_user_deinit(struct mail_raw_user **_ruser)
mail_user_unref(&ruser->mail_user);
- i_free(ruser->tmp_prefix);
i_free(ruser);
}
diff --git a/src/managesieve/managesieve-capabilities.c b/src/managesieve/managesieve-capabilities.c
index 4600b57b6..a9c825e86 100644
--- a/src/managesieve/managesieve-capabilities.c
+++ b/src/managesieve/managesieve-capabilities.c
@@ -29,7 +29,7 @@ static const struct setting_parser_info **plugin_set_roots;
#undef DEF
#define DEF(type, name) \
- { type, #name, offsetof(struct login_settings, name), NULL }
+ { type, #name, offsetof(struct plugin_settings, name), NULL }
static const struct setting_define plugin_setting_defines[] = {
{ SET_STRLIST, "plugin", offsetof(struct plugin_settings, plugin_envs), NULL },
@@ -55,8 +55,6 @@ static const struct setting_parser_info *default_plugin_set_roots[] = {
static const struct setting_parser_info **plugin_set_roots =
default_plugin_set_roots;
-static struct master_service_settings_cache *set_cache;
-
static struct plugin_settings *plugin_settings_read(void)
{
const char *error;
@@ -86,12 +84,6 @@ static const char *plugin_settings_get
return NULL;
}
-static void plugin_settings_deinit(void)
-{
- if (set_cache != NULL)
- master_service_settings_cache_deinit(&set_cache);
-}
-
/*
* Sieve environment
*/
@@ -141,8 +133,4 @@ void managesieve_capabilities_dump(void)
else
printf("SIEVE: %s, NOTIFY: %s\n", sieve_get_capabilities(svinst, NULL),
sieve_get_capabilities(svinst, "notify"));
-
- /* Deinitialize */
-
- plugin_settings_deinit();
}
--
GitLab