Commit c7e83e1c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

stream: remove stream_BlockRemaining()

parent 71d71170
......@@ -118,7 +118,6 @@ VLC_API int stream_vaControl( stream_t *s, int i_query, va_list args );
VLC_API void stream_Delete( stream_t *s );
VLC_API int stream_Control( stream_t *s, int i_query, ... );
VLC_API block_t * stream_Block( stream_t *s, int i_size );
VLC_API block_t * stream_BlockRemaining( stream_t *s, int i_max_size );
VLC_API char * stream_ReadLine( stream_t * );
VLC_API input_item_t *stream_ReadDir( stream_t * );
......
......@@ -522,50 +522,6 @@ block_t *stream_Block( stream_t *s, int i_size )
return NULL;
}
/**
* Read the remaining of the data if there is less than i_max_size bytes, otherwise
* return NULL.
*
* The stream position is unknown after the call.
*/
block_t *stream_BlockRemaining( stream_t *s, int i_max_size )
{
int i_allocate = __MIN(1000000, i_max_size);
int64_t i_size = stream_Size( s );
if( i_size > 0 )
{
int64_t i_position = stream_Tell( s );
if( i_position + i_max_size < i_size )
{
msg_Err( s, "Remaining stream size is greater than %d bytes",
i_max_size );
return NULL;
}
i_allocate = i_size - i_position;
}
if( i_allocate <= 0 )
return NULL;
block_t *p_block = block_Alloc( i_allocate );
int i_index = 0;
while( p_block )
{
int i_read = stream_Read( s, &p_block->p_buffer[i_index],
p_block->i_buffer - i_index);
if( i_read <= 0 )
break;
i_index += i_read;
i_max_size -= i_read;
if( i_max_size <= 0 )
break;
p_block = block_Realloc( p_block, 0, p_block->i_buffer +
__MIN(1000000, i_max_size) );
}
if( p_block )
p_block->i_buffer = i_index;
return p_block;
}
/**
* Read the next input_item_t from the directory stream. It returns the next
* input item on success or NULL in case of error or end of stream. The item
......
......@@ -393,7 +393,6 @@ spu_Render
spu_RegisterChannel
spu_ClearChannel
stream_Block
stream_BlockRemaining
stream_Control
stream_Delete
stream_DemuxNew
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment