From: Timo Sirainen Date: Wed, 20 Nov 2024 13:42:31 +0000 (+0200) Subject: doveadm: Remove unused doveadm_plugin_getenv() X-Git-Tag: 2.4.0~220 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3076c87e1b9f952e546d963f78bd04e75fda370;p=thirdparty%2Fdovecot%2Fcore.git doveadm: Remove unused doveadm_plugin_getenv() --- diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 5ffbfdaa01..7d88ce886e 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -77,9 +77,6 @@ static const struct setting_define doveadm_setting_defines[] = { { .type = SET_FILTER_NAME, .key = DOVEADM_SERVER_FILTER }, - { .type = SET_STRLIST, .key = "plugin", - .offset = offsetof(struct doveadm_settings, plugin_envs) }, - SETTING_DEFINE_LIST_END }; @@ -104,8 +101,6 @@ const struct doveadm_settings doveadm_default_settings = { .dsync_hashed_headers = "Date Message-ID", .dsync_commit_msgs_interval = 100, .doveadm_api_key = "", - - .plugin_envs = ARRAY_INIT }; const struct setting_parser_info doveadm_setting_parser_info = { diff --git a/src/doveadm/doveadm-settings.h b/src/doveadm/doveadm-settings.h index 1f67fe6f09..c0c7d9600d 100644 --- a/src/doveadm/doveadm-settings.h +++ b/src/doveadm/doveadm-settings.h @@ -37,7 +37,6 @@ struct doveadm_settings { const char *dsync_hashed_headers; unsigned int dsync_commit_msgs_interval; enum dsync_features parsed_features; - ARRAY(const char *) plugin_envs; }; diff --git a/src/doveadm/doveadm-util.c b/src/doveadm/doveadm-util.c index cd7d6fdea6..c21dbee6c0 100644 --- a/src/doveadm/doveadm-util.c +++ b/src/doveadm/doveadm-util.c @@ -88,22 +88,6 @@ const char *unixdate2tzstr(time_t timestamp, int tz_mins) return t_strfgmtime("%Y-%m-%d %H:%M:%S", timestamp + tz_mins * 60); } -const char *doveadm_plugin_getenv(const char *name) -{ - const char *const *envs; - unsigned int i, count; - - if (!array_is_created(&doveadm_settings->plugin_envs)) - return NULL; - - envs = array_get(&doveadm_settings->plugin_envs, &count); - for (i = 0; i < count; i += 2) { - if (strcmp(envs[i], name) == 0) - return envs[i+1]; - } - return NULL; -} - static int doveadm_tcp_connect_port(const char *host, in_port_t port) { diff --git a/src/doveadm/doveadm-util.h b/src/doveadm/doveadm-util.h index bfc629f278..21802b1255 100644 --- a/src/doveadm/doveadm-util.h +++ b/src/doveadm/doveadm-util.h @@ -9,7 +9,6 @@ extern bool doveadm_verbose, doveadm_debug, doveadm_server; const char *unixdate2str(time_t timestamp); const char *unixdate2tzstr(time_t timestamp, int tz_mins); -const char *doveadm_plugin_getenv(const char *name); int doveadm_connect(const char *path); int doveadm_tcp_connect(const char *target, in_port_t default_port); int doveadm_connect_with_default_port(const char *path,