Commit 34293972 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove FREE() macro, since free() does the same internally

parent 3f07af6a
......@@ -358,7 +358,7 @@ static void Close( vlc_object_t * p_this )
httpd_StreamDelete( p_sys->p_httpd_stream );
httpd_HostDelete( p_sys->p_httpd_host );
FREE( p_sys->p_header );
free( p_sys->p_header );
msg_Dbg( p_access, "Close" );
......
......@@ -406,7 +406,7 @@ static int cinepak_decode_frame( cinepak_context_t *p_context,
int i;
for( i = 0; i < 3; i++ )
{
FREE( p_context->p_pix[i] );
free( p_context->p_pix[i] );
}
p_context->i_width = i_width;
......
......@@ -158,7 +158,7 @@ static int Demux( demux_t *p_demux )
{
msg_Err( p_demux, "invalid root node %i, %s",
xml_ReaderNodeType( p_xml_reader ), psz_eltname );
FREE( psz_eltname );
free( psz_eltname );
/* second line has <?quicktime tag ... so we try to skip it */
msg_Dbg( p_demux, "trying to read one more node" );
......@@ -169,11 +169,11 @@ static int Demux( demux_t *p_demux )
{
msg_Err( p_demux, "invalid root node %i, %s",
xml_ReaderNodeType( p_xml_reader ), psz_eltname );
FREE( psz_eltname );
free( psz_eltname );
return -1;
}
}
FREE( psz_eltname );
free( psz_eltname );
while( xml_ReaderNextAttr( p_sys->p_xml_reader ) == VLC_SUCCESS )
{
......@@ -182,8 +182,8 @@ static int Demux( demux_t *p_demux )
if( !psz_attrname || !psz_attrvalue )
{
FREE( psz_attrname );
FREE( psz_attrvalue );
free( psz_attrname );
free( psz_attrvalue );
return -1;
}
......@@ -318,8 +318,8 @@ static int Demux( demux_t *p_demux )
msg_Dbg( p_demux, "Attribute %s with value %s isn't valid",
psz_attrname, psz_attrvalue );
}
FREE( psz_attrname );
FREE( psz_attrvalue );
free( psz_attrname );
free( psz_attrvalue );
}
msg_Dbg( p_demux, "autoplay: %s (unused by VLC)",
......@@ -369,11 +369,11 @@ static int Demux( demux_t *p_demux )
p_sys->p_playlist = NULL;
FREE( psz_href );
FREE( psz_moviename );
FREE( psz_qtnext );
FREE( psz_src );
FREE( psz_mimetype );
free( psz_href );
free( psz_moviename );
free( psz_qtnext );
free( psz_src );
free( psz_mimetype );
return -1; /* Needed for correct operation of go back */
}
......
......@@ -74,7 +74,7 @@ static int Open( vlc_object_t *p_this )
return -1;
case XML_READER_STARTELEM:
FREE( psz_elname );
free( psz_elname );
psz_elname = xml_ReaderName( p_reader );
if( !psz_elname ) return VLC_EGENERIC;
printf( "<%s", psz_elname );
......@@ -83,7 +83,7 @@ static int Open( vlc_object_t *p_this )
case XML_READER_TEXT:
break;
case XML_READER_ENDELEM:
FREE( psz_elname );
free( psz_elname );
psz_elname = xml_ReaderName( p_reader );
if( !psz_elname ) return VLC_EGENERIC;
printf( ">" );
......
......@@ -291,8 +291,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
}
if( !f_fname || !f_dir )
{
FREE( f_fname );
FREE( f_dir );
free( f_fname );
free( f_dir );
return NULL;
}
......@@ -302,10 +302,10 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
f_fname_trim = malloc(i_fname_len + 1 );
if( !f_fname_noext || !f_fname_trim )
{
FREE( f_fname );
FREE( f_dir );
FREE( f_fname_noext );
FREE( f_fname_trim );
free( f_fname );
free( f_dir );
free( f_fname_noext );
free( f_fname_trim );
return NULL;
}
......@@ -408,14 +408,14 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
if( ppsz_dir_content )
{
for( a = 0; a < i_dir_content; a++ )
FREE( ppsz_dir_content[a] );
free( ppsz_dir_content[a] );
free( ppsz_dir_content );
}
}
if( subdirs )
{
for( j = 0; subdirs[j]; j++ )
FREE( subdirs[j] );
free( subdirs[j] );
free( subdirs );
}
free( f_fname );
......@@ -464,8 +464,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
for( j = 0; j < i_sub_count; j++ )
{
FREE( result[j].psz_fname );
FREE( result[j].psz_ext );
free( result[j].psz_fname );
free( result[j].psz_ext );
}
free( result );
......
......@@ -302,7 +302,7 @@ void __intf_ProgressUpdate( vlc_object_t *p_this, int i_id,
return;
}
FREE( p_dialog->psz_description );
free( p_dialog->psz_description );
p_dialog->psz_description = strdup( psz_status );
p_dialog->val.f_float = f_pos;
......
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