i = [o_tbl_dataTable selectedRow];
- if( pp_bookmarks[i]->psz_name )
- free( pp_bookmarks[i]->psz_name );
+ free( pp_bookmarks[i]->psz_name );
pp_bookmarks[i]->psz_name = strdup([[o_edit_fld_name stringValue] UTF8String]);
pp_bookmarks[i]->i_byte_offset = [[o_edit_fld_bytes stringValue] intValue];
4, ppsz_text[3],
-1);
- if (ppsz_text[1]) free(ppsz_text[1]);
+ free(ppsz_text[1]);
}
/* kludge */
for (i=0; i<n; i++)
4, ppsz_text[3],
-1);
- if (ppsz_text[1]) free(ppsz_text[1]);
+ free(ppsz_text[1]);
}
}
free(pp_namelist);
{
FT_Done_FreeType( m_lib );
}
- if( m_buffer )
- {
- free( m_buffer );
- }
+ free( m_buffer );
}
}
delete pLoader;
- if( skin_last )
- {
- free( skin_last );
- }
+ free( skin_last );
// Get the instance of OSLoop
OSLoop *loop = OSFactory::instance( p_intf )->getOSLoop();
# define ALLOC(size) (malloc(size))
#endif
#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
+# define TRYFREE(p) {free(p);}
#endif
#define SIZECENTRALDIRITEM (0x2e)
DialogsProvider::~DialogsProvider()
{
/* Clean up */
- if( p_open_dialog ) delete p_open_dialog;
- if( p_playlist_dialog ) delete p_playlist_dialog;
- if( p_messages_dialog ) delete p_messages_dialog;
- if( p_fileinfo_dialog ) delete p_fileinfo_dialog;
- if( p_prefs_dialog ) delete p_prefs_dialog;
+ delete p_open_dialog;
+ delete p_playlist_dialog;
+ delete p_messages_dialog;
+ delete p_fileinfo_dialog;
+ delete p_prefs_dialog;
if( h_gsgetfile_dll ) FreeLibrary( h_gsgetfile_dll );
}
PopEventHandler(true);
/* Clean up */
- if( p_open_dialog ) delete p_open_dialog;
+ delete p_open_dialog;
if( p_prefs_dialog ) p_prefs_dialog->Destroy();
- if( p_file_dialog ) delete p_file_dialog;
- if( p_playlist_dialog ) delete p_playlist_dialog;
- if( p_messages_dialog ) delete p_messages_dialog;
- if( p_fileinfo_dialog ) delete p_fileinfo_dialog;
- if( p_file_generic_dialog ) delete p_file_generic_dialog;
- if( p_wizard_dialog ) delete p_wizard_dialog;
- if( p_bookmarks_dialog ) delete p_bookmarks_dialog;
+ delete p_file_dialog;
+ delete p_playlist_dialog;
+ delete p_messages_dialog;
+ delete p_fileinfo_dialog;
+ delete p_file_generic_dialog;
+ delete p_wizard_dialog;
+ delete p_bookmarks_dialog;
#ifdef UPDATE_CHECK
- if( p_updatevlc_dialog ) delete p_updatevlc_dialog;
+ delete p_updatevlc_dialog;
#endif
- //if( p_vlm_dialog ) delete p_vlm_dialog;
+ //delete p_vlm_dialog;
- if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
+ delete p_intf->p_sys->p_icon;
/* We must set this here because on win32 this destructor will be
* automatically called so we must not call it again on wxApp->OnExit().
OpenDialog::~OpenDialog()
{
/* Clean up */
- if( file_dialog ) delete file_dialog;
- if( sout_dialog ) delete sout_dialog;
- if( subsfile_dialog ) delete subsfile_dialog;
+ delete file_dialog;
+ delete sout_dialog;
+ delete subsfile_dialog;
}
int OpenDialog::Show( int i_access_method, int i_arg )
msg = wxString(wxU( psz_artist )) + wxT(" - ") +
wxString(wxU(psz_name)) + duration;
}
- if( psz_artist )
- free( psz_artist );
+ free( psz_artist );
free( psz_name );
treectrl->SetItemText( item , msg );
treectrl->SetItemImage( item, p_item->p_input->i_type );
hue_slider->Disable();
gamma_slider->Disable();
}
- if( psz_filters ) free( psz_filters );
+ free( psz_filters );
int i_value = config_GetInt( p_intf, "hue" );
if( i_value > 0 && i_value < 360 )
vlc_object_release( p_playlist );
continue;
}
- if( psz_display )
- {
- free( psz_display );
- psz_display = NULL;
- }
+ free( psz_display );
+ psz_display = NULL;
if( p_playlist->status.i_status == PLAYLIST_STOPPED )
{
psz_display = strdup(_("Stop"));
# endif
}
- if( p_intf->p_sys )
- {
- free( p_intf->p_sys );
- p_intf->p_sys = NULL;
- }
+ free( p_intf->p_sys );
+ p_intf->p_sys = NULL;
#endif
}
static void FreeString( svg_rendition_t *p_svg )
{
- if( p_svg->psz_text )
- free( p_svg->psz_text );
+ free( p_svg->psz_text );
/* p_svg->p_rendition is a GdkPixbuf, and its allocation is
managed through ref. counting */
if( p_svg->p_rendition )
for( i = 0; i < p_sys->i_nb_streams; i++ )
{
sout_StreamDelete( p_sys->pp_streams[i] );
- if( p_sys->ppsz_select[i] )
- {
- free( p_sys->ppsz_select[i] );
- }
- }
- if( p_sys->pp_streams )
- {
- free( p_sys->pp_streams );
- }
- if( p_sys->ppsz_select )
- {
- free( p_sys->ppsz_select );
+ free( p_sys->ppsz_select[i] );
}
+ free( p_sys->pp_streams );
+ free( p_sys->ppsz_select );
free( p_sys );
}
{
if ( pp_ring[i] != NULL )
{
- if ( pp_ring[i]->p_data_orig != NULL )
- free( pp_ring[i]->p_data_orig );
+ free( pp_ring[i]->p_data_orig );
free( pp_ring[i]->p_sys );
free( pp_ring[i] );
}
{
if ( pp_ring[i]->i_status == DESTROYED_PICTURE )
{
- if ( pp_ring[i]->p_data_orig != NULL )
- free( pp_ring[i]->p_data_orig );
+ free( pp_ring[i]->p_data_orig );
free( pp_ring[i]->p_sys );
free( pp_ring[i] );
}