block_Fifo(Wake|Get|Show): always cancellation points

This is consistent with the comments in <vlc_block.h>.
So far, cancellation would only occur when sleeping was needed.

diff --git a/src/misc/block.c b/src/misc/block.c
index 1c68a3f249359a6becb37578a9365996ea8e9f96..3cb537581be6e99c699baa426c7ea32dc01ed50f 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -431,6 +431,8 @@ void block_FifoEmpty( block_fifo_t *p_fifo )
  */
 void block_FifoPace (block_fifo_t *fifo, size_t max_depth, size_t max_size)
 {
+    vlc_testcancel ();
+
     vlc_mutex_lock (&fifo->lock);
     while ((fifo->i_depth > max_depth) || (fifo->i_size > max_size))
     {
@@ -483,6 +485,8 @@ block_t *block_FifoGet( block_fifo_t *p_fifo )
 {
     block_t *b;
 
+    vlc_testcancel( );
+
     vlc_mutex_lock( &p_fifo->lock );
     mutex_cleanup_push( &p_fifo->lock );
 
@@ -523,6 +527,8 @@ block_t *block_FifoShow( block_fifo_t *p_fifo )
 {
     block_t *b;
 
+    vlc_testcancel( );
+
     vlc_mutex_lock( &p_fifo->lock );
     mutex_cleanup_push( &p_fifo->lock );