From 19d4493ab9bb01703895f578177130a4f8b6ac68 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 17 Dec 2012 11:22:32 -0600 Subject: [PATCH] FS-4876 reverting this to default --- src/switch_apr.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/switch_apr.c b/src/switch_apr.c index d4db415280..aeb10185a9 100644 --- a/src/switch_apr.c +++ b/src/switch_apr.c @@ -1050,13 +1050,7 @@ SWITCH_DECLARE(unsigned int) switch_queue_size(switch_queue_t *queue) SWITCH_DECLARE(switch_status_t) switch_queue_pop(switch_queue_t *queue, void **data) { - apr_status_t s; - - do { - s = apr_queue_pop(queue, data); - } while (s == APR_EINTR); - - return s; + return apr_queue_pop(queue, data); } SWITCH_DECLARE(switch_status_t) switch_queue_pop_timeout(switch_queue_t *queue, void **data, switch_interval_time_t timeout) @@ -1078,14 +1072,7 @@ SWITCH_DECLARE(switch_status_t) switch_queue_push(switch_queue_t *queue, void *d SWITCH_DECLARE(switch_status_t) switch_queue_trypop(switch_queue_t *queue, void **data) { - apr_status_t s; - - do { - s = apr_queue_trypop(queue, data); - } while (s == APR_EINTR); - - return s; - + return apr_queue_trypop(queue, data); } SWITCH_DECLARE(switch_status_t) switch_queue_interrupt_all(switch_queue_t *queue)