From: Anthony Loiseau Date: Thu, 16 Jul 2009 13:00:00 +0000 (+0200) Subject: cosmetic: remove nullity test on free() and delete X-Git-Tag: 1.1.0-ff~4943 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d632dbed7d21d862f159c08661feefa8b3c12935;p=vlc cosmetic: remove nullity test on free() and delete Signed-off-by: Rémi Duraffort --- diff --git a/modules/access/cdda/info.c b/modules/access/cdda/info.c index b0de8285b6..85ddf1d40f 100644 --- a/modules/access/cdda/info.c +++ b/modules/access/cdda/info.c @@ -48,8 +48,8 @@ static char *CDDAFormatMRL( const access_t *p_access, track_t i_track ); #ifdef HAVE_LIBCDDB #define free_and_dup(var, val) \ - if (var) free(var); \ - if (val) var=strdup(val); + free( var ); \ + if (val) var = strdup( val ); /* Saves CDDB information about CD-DA via libcddb. */ diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c index 5ac53bf875..25da2fc42c 100644 --- a/modules/codec/realvideo.c +++ b/modules/codec/realvideo.c @@ -222,7 +222,7 @@ static int InitVideo(decoder_t *p_dec) free( p_sys ); return VLC_EGENERIC; } - if (p_sys->plane) free(p_sys->plane); + free( p_sys->plane ); p_sys->plane = malloc (p_dec->fmt_in.video.i_width*p_dec->fmt_in.video.i_height*3/2 + 1024 ); if (NULL == p_sys->plane) { @@ -419,11 +419,8 @@ static void Close( vlc_object_t *p_this ) #endif p_sys->rv_handle=NULL; - if (p_sys->plane) - { - free(p_sys->plane); - p_sys->plane = NULL; - } + free( p_sys->plane ); + p_sys->plane = NULL; msg_Dbg( p_dec, "FreeLibrary ok." ); #ifdef LOADER diff --git a/modules/codec/wmafixed/wma.c b/modules/codec/wmafixed/wma.c index a67e6eb8bc..e20309ecce 100644 --- a/modules/codec/wmafixed/wma.c +++ b/modules/codec/wmafixed/wma.c @@ -261,8 +261,7 @@ static aout_buffer_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block ) /* worst case */ size_t i_buffer = BLOCK_MAX_SIZE * MAX_CHANNELS * p_sys->wmadec.nb_frames; - if( p_sys->p_output ) - free( p_sys->p_output ); + free( p_sys->p_output ); p_sys->p_output = malloc(i_buffer * sizeof(int32_t) ); p_sys->p_samples = (int8_t*)p_sys->p_output; diff --git a/modules/control/http/rpn.c b/modules/control/http/rpn.c index a0a7284b55..ce89c7ec26 100644 --- a/modules/control/http/rpn.c +++ b/modules/control/http/rpn.c @@ -641,8 +641,7 @@ void EvaluateRPN( intf_thread_t *p_intf, mvar_t *vars, if( !b_error ) var_Set( p_object, psz_variable, val ); - if( psz_value != NULL ) - free( psz_value ); + free( psz_value ); } else msg_Warn( p_intf, "vlc_var_set called without an object" ); @@ -811,8 +810,7 @@ void EvaluateRPN( intf_thread_t *p_intf, mvar_t *vars, } i_result = config_SaveConfigFile( p_intf, psz_module ); - if( psz_module != NULL ) - free( psz_module ); + free( psz_module ); SSPushN( st, i_result ); } else if( !strcmp( s, "vlc_config_reset" ) ) diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 33fffa5023..5ea638e594 100644 --- a/modules/demux/mkv/matroska_segment_parse.cpp +++ b/modules/demux/mkv/matroska_segment_parse.cpp @@ -306,8 +306,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxTrackLanguage &lang = *(KaxTrackLanguage*)l; - if ( tk->fmt.psz_language != NULL ) - free( tk->fmt.psz_language ); + free( tk->fmt.psz_language ); tk->fmt.psz_language = strdup( string( lang ).c_str() ); msg_Dbg( &sys.demuxer, "| | | + Track Language=`%s'", tk->fmt.psz_language ); diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 599263efda..f47a270048 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -893,8 +893,7 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { /* Delete old popup if there is one */ - if( p_intf->p_sys->p_popup_menu ) - delete p_intf->p_sys->p_popup_menu; + delete p_intf->p_sys->p_popup_menu; if( !show ) { diff --git a/modules/gui/skins2/commands/async_queue.cpp b/modules/gui/skins2/commands/async_queue.cpp index de19dc7b37..e2fcbac35d 100644 --- a/modules/gui/skins2/commands/async_queue.cpp +++ b/modules/gui/skins2/commands/async_queue.cpp @@ -67,11 +67,8 @@ AsyncQueue *AsyncQueue::instance( intf_thread_t *pIntf ) void AsyncQueue::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_queue ) - { - delete pIntf->p_sys->p_queue; - pIntf->p_sys->p_queue = NULL; - } + delete pIntf->p_sys->p_queue; + pIntf->p_sys->p_queue = NULL; } diff --git a/modules/gui/skins2/macosx/macosx_loop.cpp b/modules/gui/skins2/macosx/macosx_loop.cpp index f36bad3341..ab46ae913c 100644 --- a/modules/gui/skins2/macosx/macosx_loop.cpp +++ b/modules/gui/skins2/macosx/macosx_loop.cpp @@ -72,11 +72,8 @@ OSLoop *MacOSXLoop::instance( intf_thread_t *pIntf ) void MacOSXLoop::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_osLoop ) - { - delete pIntf->p_sys->p_osLoop; - pIntf->p_sys->p_osLoop = NULL; - } + delete pIntf->p_sys->p_osLoop; + pIntf->p_sys->p_osLoop = NULL; } diff --git a/modules/gui/skins2/parser/interpreter.cpp b/modules/gui/skins2/parser/interpreter.cpp index 5f3ae2223c..56c9f11a85 100644 --- a/modules/gui/skins2/parser/interpreter.cpp +++ b/modules/gui/skins2/parser/interpreter.cpp @@ -141,11 +141,8 @@ Interpreter *Interpreter::instance( intf_thread_t *pIntf ) void Interpreter::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_interpreter ) - { - delete pIntf->p_sys->p_interpreter; - pIntf->p_sys->p_interpreter = NULL; - } + delete pIntf->p_sys->p_interpreter; + pIntf->p_sys->p_interpreter = NULL; } diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp index 98f34b8d9f..e267295c6b 100644 --- a/modules/gui/skins2/src/dialogs.cpp +++ b/modules/gui/skins2/src/dialogs.cpp @@ -147,11 +147,8 @@ Dialogs *Dialogs::instance( intf_thread_t *pIntf ) void Dialogs::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_dialogs ) - { - delete pIntf->p_sys->p_dialogs; - pIntf->p_sys->p_dialogs = NULL; - } + delete pIntf->p_sys->p_dialogs; + pIntf->p_sys->p_dialogs = NULL; } diff --git a/modules/gui/skins2/src/logger.cpp b/modules/gui/skins2/src/logger.cpp index b0b0b2210e..606a442289 100644 --- a/modules/gui/skins2/src/logger.cpp +++ b/modules/gui/skins2/src/logger.cpp @@ -52,11 +52,8 @@ Logger *Logger::instance( intf_thread_t *pIntf ) void Logger::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_logger ) - { - delete pIntf->p_sys->p_logger; - pIntf->p_sys->p_logger = NULL; - } + delete pIntf->p_sys->p_logger; + pIntf->p_sys->p_logger = NULL; } diff --git a/modules/gui/skins2/src/os_factory.cpp b/modules/gui/skins2/src/os_factory.cpp index c954633164..297485c2b0 100644 --- a/modules/gui/skins2/src/os_factory.cpp +++ b/modules/gui/skins2/src/os_factory.cpp @@ -64,10 +64,7 @@ OSFactory *OSFactory::instance( intf_thread_t *pIntf ) void OSFactory::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_osFactory ) - { - delete pIntf->p_sys->p_osFactory; - pIntf->p_sys->p_osFactory = NULL; - } + delete pIntf->p_sys->p_osFactory; + pIntf->p_sys->p_osFactory = NULL; } diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp index 04fc44e8c2..5e4819bdbd 100644 --- a/modules/gui/skins2/src/theme_repository.cpp +++ b/modules/gui/skins2/src/theme_repository.cpp @@ -49,11 +49,8 @@ ThemeRepository *ThemeRepository::instance( intf_thread_t *pIntf ) void ThemeRepository::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_repository ) - { - delete pIntf->p_sys->p_repository; - pIntf->p_sys->p_repository = NULL; - } + delete pIntf->p_sys->p_repository; + pIntf->p_sys->p_repository = NULL; } diff --git a/modules/gui/skins2/src/var_manager.cpp b/modules/gui/skins2/src/var_manager.cpp index 91f65fef83..053ac95026 100644 --- a/modules/gui/skins2/src/var_manager.cpp +++ b/modules/gui/skins2/src/var_manager.cpp @@ -74,11 +74,8 @@ VarManager *VarManager::instance( intf_thread_t *pIntf ) void VarManager::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_varManager ) - { - delete pIntf->p_sys->p_varManager; - pIntf->p_sys->p_varManager = NULL; - } + delete pIntf->p_sys->p_varManager; + pIntf->p_sys->p_varManager = NULL; } diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp index a9a8786cc6..6dc6eff2b4 100644 --- a/modules/gui/skins2/src/vlcproc.cpp +++ b/modules/gui/skins2/src/vlcproc.cpp @@ -65,11 +65,8 @@ VlcProc *VlcProc::instance( intf_thread_t *pIntf ) void VlcProc::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_vlcProc ) - { - delete pIntf->p_sys->p_vlcProc; - pIntf->p_sys->p_vlcProc = NULL; - } + delete pIntf->p_sys->p_vlcProc; + pIntf->p_sys->p_vlcProc = NULL; } diff --git a/modules/gui/skins2/src/vout_manager.cpp b/modules/gui/skins2/src/vout_manager.cpp index 65d8d89e26..400743187d 100644 --- a/modules/gui/skins2/src/vout_manager.cpp +++ b/modules/gui/skins2/src/vout_manager.cpp @@ -50,11 +50,8 @@ VoutManager *VoutManager::instance( intf_thread_t *pIntf ) void VoutManager::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_voutManager ) - { - delete pIntf->p_sys->p_voutManager; - pIntf->p_sys->p_voutManager = NULL; - } + delete pIntf->p_sys->p_voutManager; + pIntf->p_sys->p_voutManager = NULL; } diff --git a/modules/gui/skins2/win32/win32_loop.cpp b/modules/gui/skins2/win32/win32_loop.cpp index 1ddc580b36..bd7fda5d70 100644 --- a/modules/gui/skins2/win32/win32_loop.cpp +++ b/modules/gui/skins2/win32/win32_loop.cpp @@ -107,11 +107,8 @@ OSLoop *Win32Loop::instance( intf_thread_t *pIntf ) void Win32Loop::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_osLoop ) - { - delete pIntf->p_sys->p_osLoop; - pIntf->p_sys->p_osLoop = NULL; - } + delete pIntf->p_sys->p_osLoop; + pIntf->p_sys->p_osLoop = NULL; } diff --git a/modules/gui/skins2/x11/x11_loop.cpp b/modules/gui/skins2/x11/x11_loop.cpp index f9cd7779d6..b7af5995b7 100644 --- a/modules/gui/skins2/x11/x11_loop.cpp +++ b/modules/gui/skins2/x11/x11_loop.cpp @@ -100,11 +100,8 @@ OSLoop *X11Loop::instance( intf_thread_t *pIntf, X11Display &rDisplay ) void X11Loop::destroy( intf_thread_t *pIntf ) { - if( pIntf->p_sys->p_osLoop ) - { - delete pIntf->p_sys->p_osLoop; - pIntf->p_sys->p_osLoop = NULL; - } + delete pIntf->p_sys->p_osLoop; + pIntf->p_sys->p_osLoop = NULL; } diff --git a/modules/packetizer/dirac.c b/modules/packetizer/dirac.c index 39c48185a6..de4812b5d9 100644 --- a/modules/packetizer/dirac.c +++ b/modules/packetizer/dirac.c @@ -922,8 +922,7 @@ static int dirac_InspectDataUnit( decoder_t *p_dec, block_t **pp_block, block_t * - required for ogg muxing * - useful for error checking * - it isn't allowed to change until an eos */ - if( p_es->p_extra ) - free( p_es->p_extra ); + free( p_es->p_extra ); p_es->p_extra = calloc( 1, p_block->i_buffer + 13 ); if( !p_es->p_extra ) { diff --git a/modules/video_filter/atmo/AtmoConfig.cpp b/modules/video_filter/atmo/AtmoConfig.cpp index 1249bebd34..48d4fb86ab 100644 --- a/modules/video_filter/atmo/AtmoConfig.cpp +++ b/modules/video_filter/atmo/AtmoConfig.cpp @@ -64,11 +64,10 @@ CAtmoConfig::CAtmoConfig() } CAtmoConfig::~CAtmoConfig() { - // and finally cleanup... - clearAllChannelMappings(); + // and finally cleanup... + clearAllChannelMappings(); #if !defined (WIN32) - if(m_devicename) - free(m_devicename); + free( m_devicename ); #endif } @@ -234,9 +233,8 @@ void CAtmoConfig::AddChannelAssignment(tChannelAssignment *ta) { } void CAtmoConfig::SetChannelAssignment(int index, tChannelAssignment *ta) { - if(m_ChannelAssignments[index]!=NULL) - delete m_ChannelAssignments[index]; - m_ChannelAssignments[index] = ta; + delete m_ChannelAssignments[index]; + m_ChannelAssignments[index] = ta; } CAtmoZoneDefinition *CAtmoConfig::getZoneDefinition(int zoneIndex) { diff --git a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp index 1d77ee87ae..26410b9eb6 100644 --- a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp +++ b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp @@ -41,9 +41,8 @@ CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData) CAtmoExternalCaptureInput::~CAtmoExternalCaptureInput(void) { - /* if there is still an unprocessed bufferpicture do kill it */ - if(m_pCurrentFramePixels != NULL) - free(m_pCurrentFramePixels); + /* if there is still an unprocessed bufferpicture do kill it */ + free( m_pCurrentFramePixels ); #if defined(_ATMO_VLC_PLUGIN_) vlc_cond_destroy( &m_WakeupCond ); diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp index aa1970229d..9cb0edef21 100644 --- a/modules/video_filter/atmo/atmo.cpp +++ b/modules/video_filter/atmo/atmo.cpp @@ -805,8 +805,7 @@ static void AtmoCreateTransferBuffers(filter_t *p_filter, we need a buffer where the image is stored (only for transfer to the processing thread) */ - if(p_sys->p_atmo_transfer_buffer) - free(p_sys->p_atmo_transfer_buffer); + free( p_sys->p_atmo_transfer_buffer ); p_sys->p_atmo_transfer_buffer = (uint8_t *)malloc(bytePerPixel * width * height); diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp index 3d899e55d3..445e964f5d 100644 --- a/modules/video_filter/opencv_example.cpp +++ b/modules/video_filter/opencv_example.cpp @@ -133,9 +133,7 @@ static void CloseFilter( vlc_object_t *p_this ) if( p_filter->p_sys->p_storage ) cvReleaseMemStorage( &p_filter->p_sys->p_storage ); - if (NULL != p_filter->p_sys->event_info.p_region) - free(p_filter->p_sys->event_info.p_region); - + free( p_filter->p_sys->event_info.p_region ); free( p_sys ); var_Destroy( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE); @@ -199,11 +197,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) if (faces && (faces->total > 0)) { //msg_Dbg( p_filter, "Found %d face(s)", faces->total ); - if (NULL != p_filter->p_sys->event_info.p_region) - { - free(p_filter->p_sys->event_info.p_region); - p_filter->p_sys->event_info.p_region = NULL; - } + free( p_filter->p_sys->event_info.p_region ); + p_filter->p_sys->event_info.p_region = NULL; if( NULL == ( p_filter->p_sys->event_info.p_region = (video_filter_region_info_t *)malloc(faces->total*sizeof(video_filter_region_info_t)))) { diff --git a/modules/video_output/qte/qte.cpp b/modules/video_output/qte/qte.cpp index f91acd7b3e..b5619d57ec 100644 --- a/modules/video_output/qte/qte.cpp +++ b/modules/video_output/qte/qte.cpp @@ -197,11 +197,8 @@ static void Close ( vlc_object_t *p_this ) module_unneed( p_vout, p_vout->p_sys->p_qte_main ); #endif - if( p_vout->p_sys ) - { - free( p_vout->p_sys ); - p_vout->p_sys = NULL; - } + free( p_vout->p_sys ); + p_vout->p_sys = NULL; } /***************************************************************************** diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c index cb522ccb48..8e10fcbade 100644 --- a/modules/video_output/x11/xvmc.c +++ b/modules/video_output/x11/xvmc.c @@ -771,8 +771,7 @@ int checkXvMCCap( vout_thread_t *p_vout ) } else { - if( p_vout->p_sys->xvmc_cap ) - free( p_vout->p_sys->xvmc_cap ); + free( p_vout->p_sys->xvmc_cap ); p_vout->p_sys->xvmc_cap = NULL; msg_Err( p_vout, "use of direct XvMC context on a remote display failed" " falling back to XV." ); @@ -1012,8 +1011,7 @@ void xxmc_dispose_context( vout_thread_t *p_vout ) } msg_Dbg( p_vout, "freeing up XvMC surfaces and subpictures" ); - if( p_vout->p_sys->xvmc_palette ) - free( p_vout->p_sys->xvmc_palette ); + free( p_vout->p_sys->xvmc_palette ); dispose_xx44_palette( &p_vout->p_sys->palette ); xxmc_xvmc_destroy_subpictures( p_vout ); xxmc_xvmc_destroy_surfaces( p_vout );