imapc: Remove "_sec" suffix from imapc_connection_retry_interval_secs

Its type is SET_TIME, so the value doesn't have to be in seconds.

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index 56eb17327454e94f47ad0208f48cd5179797344f..4f23e9912ccdcebd7b4108321af7afa8aa2448c4 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -31,7 +31,7 @@ static const struct setting_define imapc_setting_defines[] = {
        DEF(SET_TIME, imapc_cmd_timeout),
        DEF(SET_TIME, imapc_max_idle_time),
        DEF(SET_UINT, imapc_connection_retry_count),
-       DEF(SET_TIME, imapc_connection_retry_interval_secs),
+       DEF(SET_TIME, imapc_connection_retry_interval),
        DEF(SET_SIZE, imapc_max_line_length),
 
        DEF(SET_STR, pop3_deleted_flag),
@@ -57,7 +57,7 @@ static const struct imapc_settings imapc_default_settings = {
        .imapc_cmd_timeout = 5*60,
        .imapc_max_idle_time = 60*29,
        .imapc_connection_retry_count = 1,
-       .imapc_connection_retry_interval_secs = 10,
+       .imapc_connection_retry_interval = 10,
        .imapc_max_line_length = 0,
 
        .pop3_deleted_flag = ""

diff --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-storage/index/imapc/imapc-settings.h
index 593df6c77243822bb461ce2679c620958384b8ef..32be70492168fe7997a048fd03900cbeea834f28 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.h
+++ b/src/lib-storage/index/imapc/imapc-settings.h
@@ -42,7 +42,7 @@ struct imapc_settings {
        unsigned int imapc_cmd_timeout;
        unsigned int imapc_max_idle_time;
        unsigned int imapc_connection_retry_count;
-       unsigned int imapc_connection_retry_interval_secs;
+       unsigned int imapc_connection_retry_interval;
        uoff_t imapc_max_line_length;
 
        const char *pop3_deleted_flag;

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 3680cdf6ad3c177aa74add78319fd4452978c462..3c88779ed1f201fa3cb99acdbbaeba8df0759678 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -305,7 +305,7 @@ int imapc_storage_client_create(struct mail_namespace *ns,
        set.use_proxyauth = (imapc_set->parsed_features & IMAPC_FEATURE_PROXYAUTH) != 0;
        set.cmd_timeout_msecs = imapc_set->imapc_cmd_timeout * 1000;
        set.connect_retry_count = imapc_set->imapc_connection_retry_count;
-       set.connect_retry_interval_secs = imapc_set->imapc_connection_retry_interval_secs;
+       set.connect_retry_interval_secs = imapc_set->imapc_connection_retry_interval;
        set.max_idle_time = imapc_set->imapc_max_idle_time;
        set.max_line_length = imapc_set->imapc_max_line_length;
        set.dns_client_socket_path = *ns->user->set->base_dir == '\0' ? "" :