Skip to content

Commit

Permalink
imapc: Remove "_sec" suffix from imapc_connection_retry_interval_secs
Browse files Browse the repository at this point in the history
Its type is SET_TIME, so the value doesn't have to be in seconds.
  • Loading branch information
sirainen authored and GitLab committed Apr 6, 2017
1 parent 4f6a9b5 commit 294c52b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/lib-storage/index/imapc/imapc-settings.c
Expand Up @@ -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),
Expand All @@ -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 = ""
Expand Down
2 changes: 1 addition & 1 deletion src/lib-storage/index/imapc/imapc-settings.h
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/lib-storage/index/imapc/imapc-storage.c
Expand Up @@ -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' ? "" :
Expand Down

0 comments on commit 294c52b

Please sign in to comment.