Give event_base_process_active a single exit path

This commit is contained in:
Nick Mathewson 2012-05-09 10:50:07 -04:00
parent c46cb9c3a2
commit 581b5beb98

View File

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