Commit b6366fc0 authored by Rémi Duraffort's avatar Rémi Duraffort

Remove MALLOC_NULL and use calloc when needed.

parent 12879a4c
......@@ -603,10 +603,7 @@ static inline uint8_t clip_uint8_vlc( int32_t a )
else return a;
}
/* Malloc with automatic error */
#define MALLOC_NULL( var, type ) do { var = (type*)malloc( sizeof( type) ); \
if( !var ) return NULL; } while(0)
/* Free and set set the variable to NULL */
#define FREENULL(a) do { free( a ); a = NULL; } while(0)
#define EMPTY_STR(str) (!str || !*str)
......
......@@ -161,8 +161,9 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
stats_TimerStart( p_input, psz_timer_name,
STATS_TIMER_INPUT_LAUNCHING );
MALLOC_NULL( p_input->p, input_thread_private_t );
memset( p_input->p, 0, sizeof( input_thread_private_t ) );
p_input->p = calloc( 1, sizeof( input_thread_private_t ) );
if( !p_input->p )
return NULL;
/* One "randomly" selected input thread is responsible for computing
* the global stats. Check if there is already someone doing this */
......
......@@ -595,7 +595,9 @@ static msg_context_t* GetContext(void)
msg_context_t *p_ctx = vlc_threadvar_get( &msg_context );
if( p_ctx == NULL )
{
MALLOC_NULL( p_ctx, msg_context_t );
p_ctx = malloc( sizeof( msg_context_t ) );
if( !p_ctx )
return NULL;
p_ctx->psz_message = NULL;
vlc_threadvar_set( &msg_context, p_ctx );
}
......
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