if( bla ) free( bla ); => free( bla );
#define TAB_CLEAN( count, tab ) \
do { \
#define TAB_CLEAN( count, tab ) \
do { \
- if( tab ) free( tab ); \
(count)= 0; \
(tab)= NULL; \
} while(0)
(count)= 0; \
(tab)= NULL; \
} while(0)
static inline void input_item_SetName( input_item_t *p_item, const char *psz_name )
{
static inline void input_item_SetName( input_item_t *p_item, const char *psz_name )
{
- if( p_item->psz_name ) free( p_item->psz_name );
+ free( p_item->psz_name );
p_item->psz_name = strdup( psz_name );
}
p_item->psz_name = strdup( psz_name );
}
vlc_meta_Delete( p_i->p_meta );
for( i = 0; i < p_i->i_options; i++ )
vlc_meta_Delete( p_i->p_meta );
for( i = 0; i < p_i->i_options; i++ )
- {
- if( p_i->ppsz_options[i] )
- free( p_i->ppsz_options[i] );
- }
+ free( p_i->ppsz_options[i] );
TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
for( i = 0; i < p_i->i_es; i++ )
TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
for( i = 0; i < p_i->i_es; i++ )
{
struct info_t *p_info = p_category->pp_infos[j];
{
struct info_t *p_info = p_category->pp_infos[j];
- if( p_info->psz_name )
- free( p_info->psz_name);
- if( p_info->psz_value )
- free( p_info->psz_value );
+ free( p_info->psz_name);
+ free( p_info->psz_value );
free( p_info );
}
TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
free( p_info );
}
TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
- if( p_category->psz_name ) free( p_category->psz_name );
+ free( p_category->psz_name );
free( p_category );
}
TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
free( p_category );
}
TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
static inline void input_item_SetURI( input_item_t * p_i, char * psz_uri )
{
vlc_mutex_lock( &p_i->lock );
static inline void input_item_SetURI( input_item_t * p_i, char * psz_uri )
{
vlc_mutex_lock( &p_i->lock );
- if( p_i->psz_uri ) free( p_i->psz_uri );
- p_i->psz_uri = strdup( psz_uri );
+ free( p_i->psz_uri );
+ p_i->psz_uri = strdup( psz_uri );
vlc_mutex_unlock( &p_i->lock );
}
vlc_mutex_unlock( &p_i->lock );
}
static inline void vlc_seekpoint_Delete( seekpoint_t *point )
{
if( !point ) return;
static inline void vlc_seekpoint_Delete( seekpoint_t *point )
{
if( !point ) return;
- if( point->psz_name ) free( point->psz_name );
+ free( point->psz_name );
- if( t->psz_name ) free( t->psz_name );
for( i = 0; i < t->i_seekpoint; i++ )
{
for( i = 0; i < t->i_seekpoint; i++ )
{
- if( t->seekpoint[i]->psz_name ) free( t->seekpoint[i]->psz_name );
+ free( t->seekpoint[i]->psz_name );
free( t->seekpoint[i] );
}
free( t->seekpoint[i] );
}
- if( t->seekpoint ) free( t->seekpoint );
free( a->psz_name );
free( a->psz_mime );
free( a->psz_description );
free( a->psz_name );
free( a->psz_mime );
free( a->psz_description );
- if( a->p_data )
- free( a->p_data );
free( a );
}
/*****************************************************************************
free( a );
}
/*****************************************************************************
static inline void vlc_meta_Set( vlc_meta_t * p_meta, vlc_meta_type_t meta_type, const char * psz_val )
{
static inline void vlc_meta_Set( vlc_meta_t * p_meta, vlc_meta_type_t meta_type, const char * psz_val )
{
- if( p_meta->ppsz_meta[meta_type] ) free( p_meta->ppsz_meta[meta_type] );
+ free( p_meta->ppsz_meta[meta_type] );
p_meta->ppsz_meta[meta_type] = psz_val ? strdup( psz_val ) : NULL;
}
p_meta->ppsz_meta[meta_type] = psz_val ? strdup( psz_val ) : NULL;
}
{
if( src->ppsz_meta[i] )
{
{
if( src->ppsz_meta[i] )
{
- if( dst->ppsz_meta[i] ) free( dst->ppsz_meta[i] );
+ free( dst->ppsz_meta[i] );
dst->ppsz_meta[i] = strdup( src->ppsz_meta[i] );
}
}
dst->ppsz_meta[i] = strdup( src->ppsz_meta[i] );
}
}
*****************************************************************************/
static inline void vlc_UrlClean( vlc_url_t *url )
{
*****************************************************************************/
static inline void vlc_UrlClean( vlc_url_t *url )
{
- if( url->psz_buffer ) free( url->psz_buffer );
- if( url->psz_host ) free( url->psz_host );
+ free( url->psz_buffer );
+ free( url->psz_host );
url->psz_protocol = NULL;
url->psz_username = NULL;
url->psz_protocol = NULL;
url->psz_username = NULL;