From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Sat, 28 Oct 2017 12:21:29 +0000 (+0300)
Subject: global: Rename client_connection_type to doveadm_connection_type
X-Git-Tag: 2.3.0.rc1~724
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fc40674e5a33787ae7fcd47a77a77ea20977994;p=thirdparty%2Fdovecot%2Fcore.git

global: Rename client_connection_type to doveadm_connection_type
---

diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c
index 0469a31911..77594d1333 100644
--- a/src/doveadm/client-connection-http.c
+++ b/src/doveadm/client-connection-http.c
@@ -1188,7 +1188,7 @@ client_connection_http_create(int fd, bool ssl)
 	conn = p_new(pool, struct client_connection_http, 1);
 
 	if (client_connection_init(&conn->conn,
-		CLIENT_CONNECTION_TYPE_HTTP, pool, fd) < 0) {
+		DOVEADM_CONNECTION_TYPE_HTTP, pool, fd) < 0) {
 		pool_unref(&conn->conn.pool);
 		return NULL;
 	}
diff --git a/src/doveadm/client-connection-private.h b/src/doveadm/client-connection-private.h
index bb703cd294..8205531c5f 100644
--- a/src/doveadm/client-connection-private.h
+++ b/src/doveadm/client-connection-private.h
@@ -7,7 +7,7 @@ bool doveadm_client_is_allowed_command(const struct doveadm_settings *set,
 	const char *cmd_name);
 
 int client_connection_init(struct client_connection *conn,
-	enum doveadm_client_connection_type type, pool_t pool, int fd);
+	enum doveadm_client_type type, pool_t pool, int fd);
 void client_connection_destroy(struct client_connection **_conn);
 
 void client_connection_set_proctitle(struct client_connection *conn,
diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c
index 3fcbcf439e..e96a23b2e4 100644
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -56,7 +56,7 @@ doveadm_server_log_handler(const struct failure_context *ctx,
 	struct client_connection_tcp *conn = NULL;
 
 	if (doveadm_client != NULL &&
-		doveadm_client->type == CLIENT_CONNECTION_TYPE_TCP)
+		doveadm_client->type == DOVEADM_CONNECTION_TYPE_TCP)
 		conn = (struct client_connection_tcp *)doveadm_client;
 
 	if (!log_recursing && conn != NULL &&
@@ -592,7 +592,7 @@ client_connection_tcp_free(struct client_connection *_conn)
 	struct client_connection_tcp *conn =
 		(struct client_connection_tcp *)_conn;
 
-	i_assert(_conn->type == CLIENT_CONNECTION_TYPE_TCP);
+	i_assert(_conn->type == DOVEADM_CONNECTION_TYPE_TCP);
 
 	doveadm_print_deinit();
 	doveadm_print_ostream = NULL;
@@ -622,7 +622,7 @@ client_connection_tcp_create(int fd, int listen_fd, bool ssl)
 	conn->fd = fd;
 
 	if (client_connection_init(&conn->conn,
-		CLIENT_CONNECTION_TYPE_TCP, pool, fd) < 0) {
+		DOVEADM_CONNECTION_TYPE_TCP, pool, fd) < 0) {
 		client_connection_tcp_destroy(&conn);
 		return NULL;
 	}
diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index c0e67bb760..9644bd0f27 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -59,11 +59,11 @@ static int client_connection_read_settings(struct client_connection *conn)
 }
 
 int client_connection_init(struct client_connection *conn,
-	enum doveadm_client_connection_type type, pool_t pool, int fd)
+	enum doveadm_client_type type, pool_t pool, int fd)
 {
 	const char *ip;
 
-	i_assert(type != CLIENT_CONNECTION_TYPE_CLI);
+	i_assert(type != DOVEADM_CONNECTION_TYPE_CLI);
 
 	conn->type = type;
 	conn->pool = pool;
diff --git a/src/doveadm/client-connection.h b/src/doveadm/client-connection.h
index 025e35bd32..bb3797e51d 100644
--- a/src/doveadm/client-connection.h
+++ b/src/doveadm/client-connection.h
@@ -7,7 +7,7 @@
 
 struct client_connection {
 	pool_t pool;
-	enum doveadm_client_connection_type type;
+	enum doveadm_client_type type;
 	const char *name;
 
 	struct ip_addr local_ip, remote_ip;
diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 6c974f8c8d..e65f842196 100644
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -79,7 +79,7 @@ struct doveadm_cmd_context {
 	struct ip_addr local_ip, remote_ip;
 	in_port_t local_port, remote_port;
 
-	enum doveadm_client_connection_type conn_type;
+	enum doveadm_client_type conn_type;
 	struct istream *input;
 	struct ostream *output;
 };
diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index e602a7389a..4af632dc44 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -686,7 +686,7 @@ cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
 	if (changes_during_sync != NULL || changes_during_sync2 != NULL) {
 		/* don't log a warning when running via doveadm server
 		   (e.g. called by replicator) */
-		if (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI) {
+		if (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI) {
 			i_warning("Mailbox changes caused a desync. "
 				  "You may want to run dsync again: %s",
 				  changes_during_sync == NULL ||
@@ -1142,7 +1142,7 @@ cmd_dsync_server_run(struct doveadm_mail_cmd_context *_ctx,
 {
 	struct dsync_cmd_context *ctx = (struct dsync_cmd_context *)_ctx;
 	struct doveadm_cmd_context *cctx = _ctx->cctx;
-	bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+	bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 	struct dsync_ibc *ibc;
 	struct dsync_brain *brain;
 	string_t *temp_prefix, *state_str = NULL;
diff --git a/src/doveadm/doveadm-kick.c b/src/doveadm/doveadm-kick.c
index 97a4b796af..5a485774f0 100644
--- a/src/doveadm/doveadm-kick.c
+++ b/src/doveadm/doveadm-kick.c
@@ -28,7 +28,7 @@ struct kick_pid {
 struct kick_context {
 	struct who_context who;
 	HASH_TABLE(void *, struct kick_pid *) pids;
-	enum doveadm_client_connection_type conn_type;
+	enum doveadm_client_type conn_type;
 	bool force_kick;
 	ARRAY(const char *) kicked_users;
 };
@@ -101,7 +101,7 @@ kick_print_kicked(struct kick_context *ctx, const bool show_warning)
 {
 	unsigned int i, count;
 	const char *const *users;
-	bool cli = (ctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+	bool cli = (ctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 
 	if (array_count(&ctx->kicked_users) == 0) {
 		if (cli)
@@ -190,7 +190,7 @@ static void cmd_kick(struct doveadm_cmd_context *cctx)
 		return;
 	}
 	ctx.conn_type = cctx->conn_type;
-	if (ctx.conn_type != CLIENT_CONNECTION_TYPE_CLI) {
+	if (ctx.conn_type != DOVEADM_CONNECTION_TYPE_CLI) {
 		/* force-kick is a pretty ugly option. its output can't be
 		   nicely translated to an API reply. it also wouldn't be very
 		   useful in scripts, only for preventing a new admin from
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index c3760706bc..8465efb629 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -223,7 +223,7 @@ static void doveadm_mail_cmd_input_read(struct doveadm_mail_cmd_context *ctx)
 void doveadm_mail_get_input(struct doveadm_mail_cmd_context *ctx)
 {
 	const struct doveadm_cmd_context *cctx = ctx->cctx;
-	bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+	bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 	struct istream *inputs[2];
 
 	if (ctx->cmd_input != NULL)
@@ -594,7 +594,7 @@ doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
 		      const char *wildcard_user)
 {
 	const struct doveadm_cmd_context *cctx = ctx->cctx;
-	bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+	bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 	int ret;
 	const char *error;
 
@@ -662,7 +662,7 @@ doveadm_mail_cmd(const struct doveadm_mail_cmd *cmd, int argc, char *argv[])
 	int c;
 
 	i_zero(&cctx);
-	cctx.conn_type = CLIENT_CONNECTION_TYPE_CLI;
+	cctx.conn_type = DOVEADM_CONNECTION_TYPE_CLI;
 	cctx.username = getenv("USER");
 
 	ctx = doveadm_mail_cmdline_init(cmd);
@@ -964,8 +964,8 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx)
 	const char *fieldstr;
 	ARRAY_TYPE(const_string) pargv, full_args;
 	int i;
-	bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
-	bool tcp_server = (cctx->conn_type == CLIENT_CONNECTION_TYPE_TCP);
+	bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
+	bool tcp_server = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_TCP);
 	struct doveadm_mail_cmd mail_cmd = {
 		cctx->cmd->mail_cmd, cctx->cmd->name, cctx->cmd->usage
 	};
diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 0d8aeaed29..6a45c4f776 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
 	int c;
 
 	i_zero(&cctx);
-	cctx.conn_type = CLIENT_CONNECTION_TYPE_CLI;
+	cctx.conn_type = DOVEADM_CONNECTION_TYPE_CLI;
 
 	i_set_failure_exit_callback(failure_exit_callback);
 	doveadm_dsync_main(&argc, &argv);
diff --git a/src/doveadm/doveadm.h b/src/doveadm/doveadm.h
index bedf404a43..7f09681b86 100644
--- a/src/doveadm/doveadm.h
+++ b/src/doveadm/doveadm.h
@@ -11,10 +11,10 @@
 #define DOVEADM_EX_NOTPOSSIBLE EX_DATAERR
 #define DOVEADM_EX_UNKNOWN -1
 
-enum doveadm_client_connection_type {
-	CLIENT_CONNECTION_TYPE_CLI = 0,
-	CLIENT_CONNECTION_TYPE_TCP,
-	CLIENT_CONNECTION_TYPE_HTTP,
+enum doveadm_client_type {
+	DOVEADM_CONNECTION_TYPE_CLI = 0,
+	DOVEADM_CONNECTION_TYPE_TCP,
+	DOVEADM_CONNECTION_TYPE_HTTP,
 };
 
 #include "doveadm-cmd.h"
diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index 10c3e7b5a9..d44023290b 100644
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -692,7 +692,7 @@ static int cmd_mcp_key_password_run(struct doveadm_mail_cmd_context *_ctx,
 {
 	struct mcp_cmd_context *ctx =
 		(struct mcp_cmd_context *)_ctx;
-	bool cli = (_ctx->cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+	bool cli = (_ctx->cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 
 	struct raw_key {
 		const char *attr;