From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 1 Mar 2017 11:12:41 +0000 (+0200)
Subject: imap-hibernate: Avoid using casts
X-Git-Tag: 2.2.29.rc1~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=895a31a20313f1b1e2162524c039f4d4e291e619;p=thirdparty%2Fdovecot%2Fcore.git

imap-hibernate: Avoid using casts
---

diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c
index 9623b3d0d6..e119e2f1f6 100644
--- a/src/imap-hibernate/imap-client.c
+++ b/src/imap-hibernate/imap-client.c
@@ -495,7 +495,7 @@ imap_client_get_var_expand_table(struct imap_client *client)
 static const char *
 imap_client_var_expand_func_userdb(const char *data, void *context)
 {
-	const char *const *fields = (const char *const *)context;
+	const char *const *fields = context;
 	const char *field_name = t_strdup_printf("%s=",t_strcut(data, ':'));
 	const char *default_value = i_strchr_to_next(data, ':');
 	const char *value = NULL;
@@ -563,12 +563,12 @@ imap_client_create(int fd, const struct imap_client_state *state)
 	}
 	T_BEGIN {
 		string_t *str;
-		const char *const *fields =
-			t_strsplit_tabescaped(client->state.userdb_fields);
+		char **fields = p_strsplit_tabescaped(unsafe_data_stack_pool,
+						      client->state.userdb_fields);
 		str = t_str_new(256);
 		var_expand_with_funcs(str, state->mail_log_prefix,
 				      imap_client_get_var_expand_table(client),
-				      funcs, (void*)fields);
+				      funcs, fields);
 		client->log_prefix = p_strdup(pool, str_c(str));
 	} T_END;