From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 27 Oct 2017 18:57:31 +0000 (+0300)
Subject: doveadm: Rename client_connection_type to doveadm_client_connection_type
X-Git-Tag: 2.3.0.rc1~725
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ba5e7dcc2a280904fe8a7af12c63f65bd5bee10;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Rename client_connection_type to doveadm_client_connection_type

Move it to doveadm.h to allow plugins use doveadm-cmd.h
---

diff --git a/src/doveadm/client-connection-private.h b/src/doveadm/client-connection-private.h
index 5b6b698ce5..bb703cd294 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 client_connection_type type, pool_t pool, int fd);
+	enum doveadm_client_connection_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.c b/src/doveadm/client-connection.c
index 92a8cfbda3..c0e67bb760 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -59,7 +59,7 @@ static int client_connection_read_settings(struct client_connection *conn)
 }
 
 int client_connection_init(struct client_connection *conn,
-	enum client_connection_type type, pool_t pool, int fd)
+	enum doveadm_client_connection_type type, pool_t pool, int fd)
 {
 	const char *ip;
 
diff --git a/src/doveadm/client-connection.h b/src/doveadm/client-connection.h
index b33b82e304..025e35bd32 100644
--- a/src/doveadm/client-connection.h
+++ b/src/doveadm/client-connection.h
@@ -5,15 +5,9 @@
 
 #define DOVEADM_LOG_CHANNEL_ID 'L'
 
-enum client_connection_type {
-	CLIENT_CONNECTION_TYPE_CLI = 0,
-	CLIENT_CONNECTION_TYPE_TCP,
-	CLIENT_CONNECTION_TYPE_HTTP,
-};
-
 struct client_connection {
 	pool_t pool;
-	enum client_connection_type type;
+	enum doveadm_client_connection_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 743f4be263..6c974f8c8d 100644
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -2,7 +2,6 @@
 #define DOVEADM_CMD_H
 
 #include "net.h"
-#include "client-connection.h"
 
 #define DOVEADM_CMD_PARAMS_START .parameters = (const struct doveadm_cmd_param[]){
 #define DOVEADM_CMD_PARAM(optP, nameP, typeP, flagP ) { .short_opt = optP, .name = nameP, .type = typeP, .flags = flagP },
@@ -80,7 +79,7 @@ struct doveadm_cmd_context {
 	struct ip_addr local_ip, remote_ip;
 	in_port_t local_port, remote_port;
 
-	enum client_connection_type conn_type;
+	enum doveadm_client_connection_type conn_type;
 	struct istream *input;
 	struct ostream *output;
 };
diff --git a/src/doveadm/doveadm-kick.c b/src/doveadm/doveadm-kick.c
index 1805d86b1a..97a4b796af 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 client_connection_type conn_type;
+	enum doveadm_client_connection_type conn_type;
 	bool force_kick;
 	ARRAY(const char *) kicked_users;
 };
diff --git a/src/doveadm/doveadm.h b/src/doveadm/doveadm.h
index 89f5c8dc62..bedf404a43 100644
--- a/src/doveadm/doveadm.h
+++ b/src/doveadm/doveadm.h
@@ -3,7 +3,6 @@
 
 #include <sysexits.h>
 #include "doveadm-util.h"
-#include "doveadm-cmd.h"
 #include "doveadm-settings.h"
 
 #define USAGE_CMDNAME_FMT "  %-12s"
@@ -12,6 +11,14 @@
 #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,
+};
+
+#include "doveadm-cmd.h"
+
 extern bool doveadm_verbose_proctitle;
 extern int doveadm_exit_code;