From 4d62902da8765ffcba5d55f1ce8fbd7a1176a9b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Fri, 31 Oct 2008 23:29:04 +0100 Subject: [PATCH] Remove unused macros (or used only one time). --- include/vlc_common.h | 8 -------- src/input/item.c | 4 +++- src/interface/interaction.c | 12 ++++++------ src/playlist/item.c | 4 +++- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 649553b48f..27d594d465 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -610,14 +610,6 @@ static inline uint8_t clip_uint8_vlc( int32_t a ) if( !var ) return NULL; } while(0) #define MALLOC_ERR( var, type ) do { var = (type*)malloc( sizeof( type) ); \ if( !var ) return VLC_ENOMEM; } while(0) -#define MALLOC_GOTOERR( var, type ) do { var = (type*)malloc( sizeof( type) ); \ - if( !var ) goto error; } while(0) -#define DECMALLOC_VOID( var, type ) type* var = (type*)malloc( sizeof(type) );\ - if( !var ) return; -#define DECMALLOC_ERR( var, type ) type* var = (type*)malloc( sizeof(type) );\ - if( !var ) return VLC_ENOMEM; -#define DECMALLOC_NULL( var, type ) type* var = (type*)malloc( sizeof(type) );\ - if( !var ) return NULL; #define FREENULL(a) do { free( a ); a = NULL; } while(0) diff --git a/src/input/item.c b/src/input/item.c index 8ce43c3133..75477a25e7 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -496,7 +496,9 @@ input_item_t *input_item_NewWithType( vlc_object_t *p_obj, const char *psz_uri, { libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); - DECMALLOC_NULL( p_input, input_item_t ); + input_item_t* p_input = malloc( sizeof(input_item_t ) ); + if( !p_input ) + return NULL; input_item_Init( p_obj, p_input ); vlc_gc_init( p_input, input_item_Destroy ); diff --git a/src/interface/interaction.c b/src/interface/interaction.c index 2359516378..2be3317600 100644 --- a/src/interface/interaction.c +++ b/src/interface/interaction.c @@ -56,13 +56,13 @@ static void DialogDestroy( interaction_dialog_t * ); static int DialogSend( vlc_object_t *, interaction_dialog_t * ); #define DIALOG_INIT( type ) \ - DECMALLOC_ERR( p_new, interaction_dialog_t ); \ - memset( p_new, 0, sizeof( interaction_dialog_t ) ); \ + interaction_dialog_t* p_new = calloc( 1, sizeof( interaction_dialog_t ) ); \ + if( !p_new ) return VLC_EGENERIC; \ p_new->b_cancelled = false; \ - p_new->i_status = NEW_DIALOG; \ - p_new->i_flags = 0; \ - p_new->i_type = INTERACT_DIALOG_##type; \ - p_new->psz_returned[0] = NULL; \ + p_new->i_status = NEW_DIALOG; \ + p_new->i_flags = 0; \ + p_new->i_type = INTERACT_DIALOG_##type; \ + p_new->psz_returned[0] = NULL; \ p_new->psz_returned[1] = NULL #define FORMAT_DESC \ diff --git a/src/playlist/item.c b/src/playlist/item.c index dee676c86f..2fa541d18a 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -161,7 +161,9 @@ static void uninstall_input_item_observer( playlist_item_t * p_item ) playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, input_item_t *p_input ) { - DECMALLOC_NULL( p_item, playlist_item_t ); + playlist_item_t* p_item = malloc( sizeof( playlist_item_t ) ); + if( !p_item ) + return NULL; assert( p_input ); -- 2.39.2