From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 10 Mar 2016 14:39:48 +0000 (+0000)
Subject: - Fixup backend2str for libev.
X-Git-Tag: release-1.5.9rc1~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a6cf2317982078ffe41a50bdc0855f9125cc7b9;p=thirdparty%2Funbound.git

- Fixup backend2str for libev.


git-svn-id: file:///svn/unbound/trunk@3660 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/daemon/unbound.c b/daemon/unbound.c
index ce5d3e6db..d1de67369 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -92,21 +92,6 @@
 void* unbound_start_brk = 0;
 #endif
 
-#if !defined(HAVE_EVENT_BASE_GET_METHOD) && (defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP))
-static const char* ev_backend2str(int b)
-{
-	switch(b) {
-	case EVBACKEND_SELECT:	return "select";
-	case EVBACKEND_POLL:	return "poll";
-	case EVBACKEND_EPOLL:	return "epoll";
-	case EVBACKEND_KQUEUE:	return "kqueue";
-	case EVBACKEND_DEVPOLL: return "devpoll";
-	case EVBACKEND_PORT:	return "evport";
-	}
-	return "unknown";
-}
-#endif
-
 /** print usage. */
 static void usage()
 {
diff --git a/doc/Changelog b/doc/Changelog
index faa346a46..0ec1ea8f8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+10 March 2016: Wouter
+	- Fixup backend2str for libev.
+
 09 March 2016: Willem
 	- User defined pluggable event API for libunbound
 	- Fixup of compile fix for pluggable event API from P.Y. Adi
diff --git a/util/netevent.c b/util/netevent.c
index 38805485c..4fcfa9804 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2162,7 +2162,7 @@ comm_timer_is_set(struct comm_timer* timer)
 }
 
 size_t 
-comm_timer_get_mem(struct comm_timer* timer)
+comm_timer_get_mem(struct comm_timer* ATTR_UNUSED(timer))
 {
 	return sizeof(struct internal_timer);
 }
diff --git a/util/ub_event.c b/util/ub_event.c
index 43498c22c..5f4b66f01 100644
--- a/util/ub_event.c
+++ b/util/ub_event.c
@@ -93,6 +93,21 @@ const char* ub_event_get_version()
 	return event_get_version();
 }
 
+#if defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
+static const char* ev_backend2str(int b)
+{
+	switch(b) {
+	case EVBACKEND_SELECT:	return "select";
+	case EVBACKEND_POLL:	return "poll";
+	case EVBACKEND_EPOLL:	return "epoll";
+	case EVBACKEND_KQUEUE:	return "kqueue";
+	case EVBACKEND_DEVPOLL: return "devpoll";
+	case EVBACKEND_PORT:	return "evport";
+	}
+	return "unknown";
+}
+#endif
+
 void
 ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s,
 	const char** m)
@@ -110,16 +125,16 @@ ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s,
 #else
 	struct event_base* b = AS_EVENT_BASE(base);
 	*s = event_get_version();
-#  ifdef HAVE_EVENT_BASE_GET_METHOD
-	*n = "libevent";
-	if (!b)
-		b = event_base_new();
-	*m = event_base_get_method(b);
-#  elif defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
+#  if defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
 	*n = "libev";
 	if (!b)
 		b = (struct event_base*)ev_default_loop(EVFLAG_AUTO);
 	*m = ev_backend2str(ev_backend((struct ev_loop*)b));
+#  elif defined(HAVE_EVENT_BASE_GET_METHOD)
+	*n = "libevent";
+	if (!b)
+		b = event_base_new();
+	*m = event_base_get_method(b);
 #  else
 	*n = "unknown";
 	*m = "not obtainable";