Tidy up the code in evthread_make_base_notifiable a little

Previously, we had a few conditional statements with the "if (...)"
inside an #ifdef and the body outside.  That kind of thing is hard to
read.

diff --git a/event.c b/event.c
index 12522993d4f735547032d6d90c544e6187cb889d..35abd1aafbddb33b43373378552de3bcacbe944b 100644 (file)
--- a/event.c
+++ b/event.c
@@ -2564,16 +2564,15 @@ evthread_make_base_notifiable(struct event_base *base)
        if (base->th_notify_fd[0] >= 0) {
                notify = evthread_notify_base_eventfd;
                cb = evthread_notify_drain_eventfd;
-       } else
+       }
 #endif
 #if defined(_EVENT_HAVE_PIPE)
-       {
+       if (base->th_notify_fd[0] < 0) {
                if ((base->evsel->features & EV_FEATURE_FDS)) {
                        if (pipe(base->th_notify_fd) < 0)
                                event_warn("%s: pipe", __func__);
                }
        }
-       if (base->th_notify_fd[0] < 0)
 #endif
 
 #ifdef WIN32
@@ -2581,7 +2580,7 @@ evthread_make_base_notifiable(struct event_base *base)
 #else
 #define LOCAL_SOCKETPAIR_AF AF_UNIX
 #endif
-       {
+       if (base->th_notify_fd[0] < 0) {
                if (evutil_socketpair(LOCAL_SOCKETPAIR_AF, SOCK_STREAM, 0,
                        base->th_notify_fd) == -1) {
                        event_sock_warn(-1, "%s: socketpair", __func__);