From d2aac9dca9e3ee7f9071c667ff67ed7849e93835 Mon Sep 17 00:00:00 2001 From: Jiergir Ogoerg Date: Mon, 29 Jul 2013 16:50:44 -0700 Subject: [PATCH] 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. --- src/wayland-client.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/wayland-client.c b/src/wayland-client.c index 2887a405..532d379a 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -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