client: Simply wl_display_dispatch_queue_pending() and fix return value

We're supposed to return number of events dispatched on success, not 0.
Refactor to avoid goto and just return ret.
This commit is contained in:
Jiergir Ogoerg 2013-07-29 16:50:44 -07:00 committed by Kristian Høgsberg
parent 03dc786c90
commit c1fd097cd9

View File

@ -1157,18 +1157,15 @@ WL_EXPORT int
wl_display_dispatch_queue_pending(struct wl_display *display,
struct wl_event_queue *queue)
{
int ret;
pthread_mutex_lock(&display->mutex);
if (dispatch_queue(display, queue) == -1)
goto err_unlock;
ret = dispatch_queue(display, queue);
pthread_mutex_unlock(&display->mutex);
return 0;
err_unlock:
pthread_mutex_unlock(&display->mutex);
return -1;
return ret;
}
/** Process incoming events