[Project] First refactoring step libevent->libev

6 files changed, 9 insertions, 9 deletions

diff --git a/test/rspamd_async_test.c b/test/rspamd_async_test.c
index 5ac71a4da..122cca9c5 100644
--- a/test/rspamd_async_test.c
+++ b/test/rspamd_async_test.c
@@ -18,7 +18,7 @@
 #include "aio_event.h"
 #include "unix-std.h"
 
-extern struct event_base *base;
+extern struct ev_loop *base;
 
 static void
 aio_read_cb (gint fd, gint res, gsize len, gpointer data, gpointer ud)
diff --git a/test/rspamd_dkim_test.c b/test/rspamd_dkim_test.c
index b3a02b631..1cb6bf90e 100644
--- a/test/rspamd_dkim_test.c
+++ b/test/rspamd_dkim_test.c
@@ -26,7 +26,7 @@ static const gchar test_dkim_sig[] = "v=1; a=rsa-sha256; c=relaxed/relaxed; "
 		"oq3BLHap0GcMTTpSOgfQOKa8Df35Ns11JoOFjdBQ8GpM99kOrJP+vZcT8b7AMfthYm0Kwy"
 		"D9TjlkpScuoY5LjsWVnijh9dSNVLFqLatzg=;";
 
-extern struct event_base *base;
+extern struct ev_loop *base;
 
 static void
 test_key_handler (rspamd_dkim_key_t *key, gsize keylen, rspamd_dkim_context_t *ctx, gpointer ud, GError *err)
diff --git a/test/rspamd_dns_test.c b/test/rspamd_dns_test.c
index 34c35830c..8f0baca84 100644
--- a/test/rspamd_dns_test.c
+++ b/test/rspamd_dns_test.c
@@ -8,7 +8,7 @@
 #include "cfg_file.h"
 
 static guint requests = 0;
-extern struct event_base *base;
+extern struct ev_loop *base;
 struct rspamd_dns_resolver *resolver;
 
 gboolean
diff --git a/test/rspamd_http_test.c b/test/rspamd_http_test.c
index b81cc0b8b..a813e416c 100644
--- a/test/rspamd_http_test.c
+++ b/test/rspamd_http_test.c
@@ -73,7 +73,7 @@ rspamd_server_accept (gint fd, short what, void *arg)
 static void
 rspamd_http_term_handler (gint fd, short what, void *arg)
 {
-	struct event_base *ev_base = arg;
+	struct ev_loop *ev_base = arg;
 	struct timeval tv = {0, 0};
 
 	event_base_loopexit (ev_base, &tv);
@@ -84,7 +84,7 @@ rspamd_http_server_func (gint fd, const gchar *path, rspamd_inet_addr_t *addr,
 		struct rspamd_cryptobox_keypair *kp, struct rspamd_keypair_cache *c)
 {
 	struct rspamd_http_connection_router *rt;
-	struct event_base *ev_base = event_init ();
+	struct ev_loop *ev_base = event_init ();
 	struct event accept_ev, term_ev;
 
 	rt = rspamd_http_router_new (rspamd_server_error, rspamd_server_finish,
@@ -148,7 +148,7 @@ rspamd_http_client_func (const gchar *path, rspamd_inet_addr_t *addr,
 		struct rspamd_cryptobox_keypair *kp,
 		struct rspamd_cryptobox_pubkey *peer_kp,
 		struct rspamd_keypair_cache *c,
-		struct event_base *ev_base, double *latency)
+		struct ev_loop *ev_base, double *latency)
 {
 	struct rspamd_http_message *msg;
 	struct rspamd_http_connection *conn;
@@ -254,7 +254,7 @@ rspamd_http_stop_servers (pid_t *sfd)
 void
 rspamd_http_test_func (void)
 {
-	struct event_base *ev_base = event_init ();
+	struct ev_loop *ev_base = event_init ();
 	rspamd_mempool_t *pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
 	struct rspamd_cryptobox_keypair *serv_key, *client_key;
 	struct rspamd_cryptobox_pubkey *peer_key;
diff --git a/test/rspamd_test_suite.c b/test/rspamd_test_suite.c
index 2abce72a1..728acd8a2 100644
--- a/test/rspamd_test_suite.c
+++ b/test/rspamd_test_suite.c
@@ -5,7 +5,7 @@
 #include "tests.h"
 
 struct rspamd_main             *rspamd_main = NULL;
-struct event_base              *base = NULL;
+struct ev_loop              *base = NULL;
 worker_t *workers[] = { NULL };
 
 gchar *lua_test = NULL;
diff --git a/test/rspamd_upstream_test.c b/test/rspamd_upstream_test.c
index 05e0ec730..28015aaf9 100644
--- a/test/rspamd_upstream_test.c
+++ b/test/rspamd_upstream_test.c
@@ -54,7 +54,7 @@ rspamd_upstream_test_func (void)
 {
 	struct upstream_list *ls, *nls;
 	struct upstream *up, *upn;
-	struct event_base *ev_base = event_init ();
+	struct ev_loop *ev_base = event_init ();
 	struct rspamd_dns_resolver *resolver;
 	struct rspamd_config *cfg;
 	gint i, success = 0;