Give event_base_process_active a single exit path

diff --git a/event.c b/event.c
index 616ad9dab4851bac085213f218707afc1ef24fd3..2080d256442fce1d211838285ed92d3a14fbf76a 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1533,8 +1533,7 @@ event_process_active(struct event_base *base)
                                c = event_process_active_single_queue(base, activeq,
                                    maxcb, endtime);
                        if (c < 0) {
-                               base->event_running_priority = -1;
-                               return -1;
+                               goto done;
                        } else if (c > 0)
                                break; /* Processed a real event; do not
                                        * consider lower-priority events */
@@ -1543,7 +1542,9 @@ event_process_active(struct event_base *base)
                }
        }
 
+done:
        base->event_running_priority = -1;
+
        return c;
 }