From b6366fc0b0182bd552ccb0276998601ed133f1ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sun, 2 Nov 2008 13:00:01 +0100 Subject: [PATCH] Remove MALLOC_NULL and use calloc when needed. --- include/vlc_common.h | 5 +---- src/input/input.c | 5 +++-- src/misc/messages.c | 4 +++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index a637bad3c4..7060cb5c41 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -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) diff --git a/src/input/input.c b/src/input/input.c index 7e4c8f920c..a147b2ea6a 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -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 */ diff --git a/src/misc/messages.c b/src/misc/messages.c index 29031f042d..c26fccaabe 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -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 ); } -- 2.39.2