doveadm: Move extern variables out of doveadm-server.h and delete it

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index 440af73e37c5e00e58487f7dcfee828a08bfb406..30f407ced8488b7d36efd764548680d485d80735 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -175,7 +175,6 @@ noinst_HEADERS = \
        client-connection.h \
        client-connection-private.h \
        server-connection.h \
-       doveadm-server.h \
        doveadm-who.h
 
 install-exec-local:

diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c
index c59d9ddac47cd093d1edbba4234309fc815bb9f3..cb499ef91f5c670ab2b353a5f4672b72d6745b8a 100644 (file)
--- a/src/doveadm/client-connection-http.c
+++ b/src/doveadm/client-connection-http.c
@@ -23,7 +23,6 @@
 #include "http-response.h"
 #include "http-url.h"
 #include "doveadm-util.h"
-#include "doveadm-server.h"
 #include "doveadm-mail.h"
 #include "doveadm-print.h"
 #include "doveadm-settings.h"

diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c
index f63d3c32acc7216b89e00d3ef15a8398759f313a..3b08502226c9a3b8210fd62d96a12e0d073d38cf 100644 (file)
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -16,7 +16,6 @@
 #include "doveadm-util.h"
 #include "doveadm-mail.h"
 #include "doveadm-print.h"
-#include "doveadm-server.h"
 #include "client-connection-private.h"
 
 #include <unistd.h>

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 02a64a605dc63f5a656dc62e0612939bb9433937..15d73f68a4ac8c8965bdc70619176de50118ab07 100644 (file)
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -7,7 +7,6 @@
 #include "master-service-settings.h"
 #include "doveadm.h"
 #include "doveadm-settings.h"
-#include "doveadm-server.h"
 #include "client-connection-private.h"
 
 bool doveadm_client_is_allowed_command(const struct doveadm_settings *set,

diff --git a/src/doveadm/client-connection.h b/src/doveadm/client-connection.h
index bb3797e51d0e49b8440a7e9940ad82a8953b500d..3b8b429b136eefc3a087414b2dfed35374685bf9 100644 (file)
--- a/src/doveadm/client-connection.h
+++ b/src/doveadm/client-connection.h
@@ -18,6 +18,8 @@ struct client_connection {
        void (*free)(struct client_connection *conn);
 };
 
+extern struct client_connection *doveadm_client;
+
 struct client_connection *
 client_connection_tcp_create(int fd, int listen_fd, bool ssl);
 struct client_connection *

diff --git a/src/doveadm/doveadm-mail-server.c b/src/doveadm/doveadm-mail-server.c
index c0b39201562a9850803741c5ebb48a214001063f..7fd46ec7ea4109c673b60594277acf6e7ea32e6d 100644 (file)
--- a/src/doveadm/doveadm-mail-server.c
+++ b/src/doveadm/doveadm-mail-server.c
@@ -17,7 +17,6 @@
 #include "server-connection.h"
 #include "doveadm-settings.h"
 #include "doveadm-print.h"
-#include "doveadm-server.h"
 #include "doveadm-mail.h"
 
 #define DOVEADM_SERVER_CONNECTIONS_MAX 4

diff --git a/src/doveadm/doveadm-print-formatted.c b/src/doveadm/doveadm-print-formatted.c
index d0518b097c32a5a67949233bc069576beb2e476e..71f28a60d84fde6631469f0f89683e3ddf0fa45b 100644 (file)
--- a/src/doveadm/doveadm-print-formatted.c
+++ b/src/doveadm/doveadm-print-formatted.c
@@ -5,7 +5,6 @@
 #include "str.h"
 #include "ostream.h"
 #include "doveadm.h"
-#include "doveadm-server.h"
 #include "doveadm-print.h"
 #include "doveadm-print-private.h"
 #include "client-connection.h"

diff --git a/src/doveadm/doveadm-print-json.c b/src/doveadm/doveadm-print-json.c
index 540ecbb3f8723a70a54a396c91d191b076d0ff2d..13481912b5154b1a51bd02e2ec4e55dd43abebf0 100644 (file)
--- a/src/doveadm/doveadm-print-json.c
+++ b/src/doveadm/doveadm-print-json.c
@@ -7,7 +7,6 @@
 #include "ostream.h"
 #include "json-parser.h"
 #include "doveadm.h"
-#include "doveadm-server.h"
 #include "doveadm-print.h"
 #include "doveadm-print-private.h"
 #include "client-connection.h"

diff --git a/src/doveadm/doveadm-print-private.h b/src/doveadm/doveadm-print-private.h
index fe85560b751878b0f44b3316445eaf9f7b6da921..7f2ef1986ab3030d513612dcd1193c9878d66d1b 100644 (file)
--- a/src/doveadm/doveadm-print-private.h
+++ b/src/doveadm/doveadm-print-private.h
@@ -27,5 +27,6 @@ extern struct doveadm_print_vfuncs doveadm_print_table_vfuncs;
 extern struct doveadm_print_vfuncs doveadm_print_pager_vfuncs;
 extern struct doveadm_print_vfuncs doveadm_print_json_vfuncs;
 extern struct doveadm_print_vfuncs doveadm_print_formatted_vfuncs;
+extern struct doveadm_print_vfuncs doveadm_print_server_vfuncs;
 
 #endif

diff --git a/src/doveadm/doveadm-server.h b/src/doveadm/doveadm-server.h
deleted file mode 100644 (file)
index ed3355f..0000000
--- a/src/doveadm/doveadm-server.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef DOVEADM_SERVER_H
-#define DOVEADM_SERVER_H
-
-#include "auth-proxy.h"
-
-extern struct client_connection *doveadm_client;
-extern struct doveadm_print_vfuncs doveadm_print_server_vfuncs;
-
-#endif

diff --git a/src/doveadm/main.c b/src/doveadm/main.c
index 9635b8891d4aa876dc99bba27ad83a6329b0f305..f7ede399017c82670d8ab8bbfbbd4e5d8528324e 100644 (file)
--- a/src/doveadm/main.c
+++ b/src/doveadm/main.c
@@ -13,7 +13,6 @@
 #include "doveadm-dump.h"
 #include "doveadm-mail.h"
 #include "doveadm-print-private.h"
-#include "doveadm-server.h"
 #include "ostream.h"
 
 const struct doveadm_print_vfuncs *doveadm_print_vfuncs_all[] = {

diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c
index 428f06e709bd27a13fd7675300212126fc5b5469..928925ee4b06accbbf7c97a839e9183a3daad9dd 100644 (file)
--- a/src/doveadm/server-connection.c
+++ b/src/doveadm/server-connection.c
@@ -13,7 +13,6 @@
 #include "master-service.h"
 #include "doveadm.h"
 #include "doveadm-util.h"
-#include "doveadm-server.h"
 #include "server-connection.h"
 
 #define DOVEADM_LOG_CHANNEL_ID 'L'

diff --git a/src/doveadm/server-connection.h b/src/doveadm/server-connection.h
index ccf7fd12fc0a1ebb8b4078b3511aa3ca2ac5aa3a..1d83512205b460245654a8482c46b2689ef71880 100644 (file)
--- a/src/doveadm/server-connection.h
+++ b/src/doveadm/server-connection.h
@@ -1,7 +1,7 @@
 #ifndef SERVER_CONNECTION_H
 #define SERVER_CONNECTION_H
 
-#include "doveadm-server.h"
+#include "auth-proxy.h"
 
 #define SERVER_EXIT_CODE_DISCONNECTED 1000