Merge pull request #474 in FS/freeswitch from ~ARTURZ/freeswitch:FS-8141-add-apr_queu...

* commit '9e29ea01b59280845f481f5b7b3743251c77dd50':
  FS-8141 Add support for apr_queue_term() to switch_apr.c

diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index 0f872e229687dbe70cb434d1418ac6a98d71db41..04b41da6c4be6e0049f3f28b2a333e48ea4894fd 100644 (file)
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -659,6 +659,8 @@ SWITCH_DECLARE(switch_status_t) switch_queue_trypop(switch_queue_t *queue, void
 
 SWITCH_DECLARE(switch_status_t) switch_queue_interrupt_all(switch_queue_t *queue);
 
+SWITCH_DECLARE(switch_status_t) switch_queue_term(switch_queue_t *queue);
+
 /**
  * push/add a object to the queue, returning immediatly if the queue is full
  *

diff --git a/src/switch_apr.c b/src/switch_apr.c
index 5e7dc52dbd072af08e5d59e95b1abeb328d1337a..43d27243ec6a4760fe0b9b766f8371534069cdfb 100644 (file)
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -1077,7 +1077,6 @@ SWITCH_DECLARE(switch_status_t) switch_queue_pop_timeout(switch_queue_t *queue,
        return apr_queue_pop_timeout(queue, data, timeout);
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_queue_push(switch_queue_t *queue, void *data)
 {
        apr_status_t s;
@@ -1099,6 +1098,11 @@ SWITCH_DECLARE(switch_status_t) switch_queue_interrupt_all(switch_queue_t *queue
        return apr_queue_interrupt_all(queue);
 }
 
+SWITCH_DECLARE(switch_status_t) switch_queue_term(switch_queue_t *queue)
+{
+       return apr_queue_term(queue);
+}
+
 SWITCH_DECLARE(switch_status_t) switch_queue_trypush(switch_queue_t *queue, void *data)
 {
        apr_status_t s;