diff options
Diffstat (limited to 'src/input/input_http.c')
-rw-r--r-- | src/input/input_http.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c index f876885e3..c525a18fa 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -536,24 +536,11 @@ static int read_shoutcast_header(http_input_plugin_t *this) { return 0; } -/* - * helper function to release buffer - * in case demux thread is cancelled - */ -static void pool_release_buffer (void *arg) { - buf_element_t *buf = (buf_element_t *) arg; - if( buf != NULL ) - buf->free_buffer(buf); -} - static buf_element_t *http_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t todo) { off_t total_bytes; buf_element_t *buf = fifo->buffer_pool_alloc (fifo); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,NULL); - pthread_cleanup_push( pool_release_buffer, buf ); - buf->content = buf->mem; buf->type = BUF_DEMUX_BLOCK; @@ -567,9 +554,6 @@ static buf_element_t *http_plugin_read_block (input_plugin_t *this_gen, fifo_buf if (buf != NULL) buf->size = total_bytes; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE,NULL); - pthread_cleanup_pop(0); - return buf; } |