some cleaning.

diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c
index 60e43fb5e9e3fe6cc59af3ec194a4d0cc79e1cf3..6e5c51267f540c855aeee6600daf538ca037d277 100644 (file)
--- a/modules/codec/realvideo.c
+++ b/modules/codec/realvideo.c
@@ -435,8 +435,7 @@ static void Close( vlc_object_t *p_this )
 
     vlc_mutex_unlock( &rm_mutex );
 
-    if ( p_sys )
-        free( p_sys );
+    free( p_sys );
 }
 
 /*****************************************************************************

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index 7a693db73de99183d7c96dad9eabce5a86c3754f..ab7e31d1d856935b9234df274256e308fb3690e2 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -502,14 +502,13 @@ static void Run( intf_thread_t *p_intf )
             if (fd == -1)
                 continue;
 
-            telnet_client_t *cl = malloc( sizeof( telnet_client_t ));
+            telnet_client_t *cl = calloc( 1, sizeof( telnet_client_t ));
             if (cl == NULL)
             {
                 net_Close (fd);
                 continue;
             }
 
-            memset( cl, 0, sizeof(telnet_client_t) );
             cl->i_tel_cmd = 0;
             cl->fd = fd;
             cl->buffer_write = NULL;

diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 2062f93b6586c48e08b78c6d7fcadf7c0d8f965e..9492b9c3d72aa4957782f8938640f919da9dc32c 100644 (file)
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -380,8 +380,7 @@ static int Open( vlc_object_t * p_this )
     return VLC_SUCCESS;
 
 error:
-    if( p_sys )
-        free( p_sys );
+    free( p_sys );
     return VLC_EGENERIC;
 }
 

diff --git a/modules/gui/skins2/commands/cmd_change_skin.cpp b/modules/gui/skins2/commands/cmd_change_skin.cpp
index 0f389ad034c8df2553694a653e57cbec4a4e20f9..ce31e23df6b0ab818618e00a3c978a224bbe451c 100644 (file)
--- a/modules/gui/skins2/commands/cmd_change_skin.cpp
+++ b/modules/gui/skins2/commands/cmd_change_skin.cpp
@@ -48,10 +48,7 @@ void CmdChangeSkin::execute()
         // Everything went well
         msg_Info( getIntf(), "new theme successfully loaded (%s)",
                  m_file.c_str() );
-        if( pOldTheme )
-        {
-            delete pOldTheme;
-        }
+        delete pOldTheme;
     }
     else if( pOldTheme )
     {

diff --git a/modules/gui/skins2/controls/ctrl_generic.cpp b/modules/gui/skins2/controls/ctrl_generic.cpp
index 7d4796f8b6f0c2682aa21e758e9fbc26458789c5..77e0e8e90180022ae60d0a005dbae024076871b6 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_generic.cpp
+++ b/modules/gui/skins2/controls/ctrl_generic.cpp
@@ -45,10 +45,7 @@ CtrlGeneric::CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp,
 
 CtrlGeneric::~CtrlGeneric()
 {
-    if( m_pPosition )
-    {
-        delete m_pPosition;
-    }
+    delete m_pPosition;
     if( m_pVisible )
     {
         m_pVisible->delObserver( this );
@@ -60,10 +57,7 @@ void CtrlGeneric::setLayout( GenericLayout *pLayout,
                              const Position &rPosition )
 {
     m_pLayout = pLayout;
-    if( m_pPosition )
-    {
-        delete m_pPosition;
-    }
+    delete m_pPosition;
     m_pPosition = new Position( rPosition );
     onPositionChange();
 }

diff --git a/modules/gui/skins2/controls/ctrl_text.cpp b/modules/gui/skins2/controls/ctrl_text.cpp
index 09e79c332661b63095e5f7fe91a1fe6015b91384..e32da13683a8a0cfff3190cf1cd0a5f9ab1a5952 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_text.cpp
+++ b/modules/gui/skins2/controls/ctrl_text.cpp
@@ -104,18 +104,9 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable,
 CtrlText::~CtrlText()
 {
     m_rVariable.delObserver( this );
-    if( m_pTimer )
-    {
-        delete m_pTimer;
-    }
-    if( m_pImg )
-    {
-        delete m_pImg;
-    }
-    if( m_pImgDouble )
-    {
-        delete m_pImgDouble;
-    }
+    delete m_pTimer;
+    delete m_pImg;
+    delete m_pImgDouble;
 }
 
 
@@ -224,10 +215,7 @@ void CtrlText::displayText( const UString &rText )
 {
     // Create the images ('normal' and 'double') from the text
     // 'Normal' image
-    if( m_pImg )
-    {
-        delete m_pImg;
-    }
+    delete m_pImg;
     m_pImg = m_rFont.drawString( rText, m_color );
     if( !m_pImg )
     {
@@ -235,10 +223,7 @@ void CtrlText::displayText( const UString &rText )
     }
     // 'Double' image
     const UString doubleStringWithSep = rText + SEPARATOR_STRING + rText;
-    if( m_pImgDouble )
-    {
-        delete m_pImgDouble;
-    }
+    delete m_pImgDouble;
     m_pImgDouble = m_rFont.drawString( doubleStringWithSep, m_color );
 
     // Update the current image used, as if the control size had changed

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index 0c27d34d6312fde6cac0a071c2191558aef67df3..c2c5cdb06788a495c12c4300e900e399b0b6dfdc 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/modules/gui/skins2/controls/ctrl_tree.cpp
@@ -81,10 +81,7 @@ CtrlTree::~CtrlTree()
 {
     m_rTree.getPositionVar().delObserver( this );
     m_rTree.delObserver( this );
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
 }
 
 int CtrlTree::itemHeight()
@@ -729,10 +726,7 @@ void CtrlTree::makeImage()
 {
     stats_TimerStart( getIntf(), "[Skins] Playlist image",
                       STATS_TIMER_SKINS_PLAYTREE_IMAGE );
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
 
     // Get the size of the control
     const Position *pPos = getPosition();

diff --git a/modules/gui/skins2/controls/ctrl_video.cpp b/modules/gui/skins2/controls/ctrl_video.cpp
index ccd7366dc7c40a0fd864e2c2d8766dacf9412f3f..424a314c61635a90e43967649f73ad510a42264f 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_video.cpp
+++ b/modules/gui/skins2/controls/ctrl_video.cpp
@@ -51,10 +51,7 @@ CtrlVideo::~CtrlVideo()
     VarBox &rVoutSize = VlcProc::instance( getIntf() )->getVoutSizeVar();
     rVoutSize.delObserver( this );
 
-    if( m_pVout )
-    {
-        delete m_pVout;
-    }
+    delete m_pVout;
 }
 
 

diff --git a/modules/gui/skins2/src/generic_layout.cpp b/modules/gui/skins2/src/generic_layout.cpp
index 68a16517535a20b2a479ea9c525809cac531195b..3b8e65e56676fb67aa2e61c0ae964009b40d89a5 100644 (file)
--- a/modules/gui/skins2/src/generic_layout.cpp
+++ b/modules/gui/skins2/src/generic_layout.cpp
@@ -54,10 +54,7 @@ GenericLayout::GenericLayout( intf_thread_t *pIntf, int width, int height,
 
 GenericLayout::~GenericLayout()
 {
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
     list<Anchor*>::const_iterator it;
     for( it = m_anchorList.begin(); it != m_anchorList.end(); it++ )
     {

diff --git a/modules/gui/skins2/src/generic_window.cpp b/modules/gui/skins2/src/generic_window.cpp
index 6cac77834fac02e090c352ec612c24041233abea..e96f8328cb3866eea6390c0c2ea84f4819aef9fc 100644 (file)
--- a/modules/gui/skins2/src/generic_window.cpp
+++ b/modules/gui/skins2/src/generic_window.cpp
@@ -62,10 +62,7 @@ GenericWindow::~GenericWindow()
 {
     m_pVarVisible->delObserver( this );
 
-    if( m_pOsWindow )
-    {
-        delete m_pOsWindow;
-    }
+    delete m_pOsWindow;
 }
 
 

diff --git a/modules/gui/skins2/src/tooltip.cpp b/modules/gui/skins2/src/tooltip.cpp
index 57744537bdfa94150ef7bf1731828cb73e1f78bc..a0798b82f8b91bd1d0cea05d0a76b15ad973e4d5 100644 (file)
--- a/modules/gui/skins2/src/tooltip.cpp
+++ b/modules/gui/skins2/src/tooltip.cpp
@@ -51,10 +51,7 @@ Tooltip::~Tooltip()
     VarManager::instance( getIntf() )->getTooltipText().delObserver( this );
     SKINS_DELETE( m_pTimer );
     SKINS_DELETE( m_pOsTooltip );
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
 }
 
 
@@ -106,10 +103,7 @@ void Tooltip::makeImage( const UString &rText )
     int h = m_rFont.getSize() + 8;
 
     // Create the image of the tooltip
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
     m_pImage = OSFactory::instance( getIntf() )->createOSGraphics( w, h );
     m_pImage->fillRect( 0, 0, w, h, 0xffffd0 );
     m_pImage->drawRect( 0, 0, w, h, 0x000000 );

diff --git a/modules/gui/skins2/src/vout_window.cpp b/modules/gui/skins2/src/vout_window.cpp
index 81fabaef96beeb654887b243784f25d334ff8efa..ea380333275dd57d29221afae14ece4acd7814a7 100644 (file)
--- a/modules/gui/skins2/src/vout_window.cpp
+++ b/modules/gui/skins2/src/vout_window.cpp
@@ -39,10 +39,7 @@ VoutWindow::VoutWindow( intf_thread_t *pIntf, int left, int top,
 
 VoutWindow::~VoutWindow()
 {
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
 
     // Get the VlcProc
     VlcProc *pVlcProc = getIntf()->p_sys->p_vlcProc;
@@ -61,10 +58,7 @@ void VoutWindow::resize( int width, int height )
     OSFactory *pOsFactory = OSFactory::instance( getIntf() );
 
     // Recreate the image
-    if( m_pImage )
-    {
-        delete m_pImage;
-    }
+    delete m_pImage;
     m_pImage = pOsFactory->createOSGraphics( width, height );
     // Draw a black rectangle
     m_pImage->fillRect( 0, 0, width, height, 0 );

diff --git a/modules/misc/lua/libs/playlist.c b/modules/misc/lua/libs/playlist.c
index 02d7144bab6c41d3d3ea6acb8cec75ec01e9d883..0a2cf8dc032ac7f57cf5703d38fd79c2db070499 100644 (file)
--- a/modules/misc/lua/libs/playlist.c
+++ b/modules/misc/lua/libs/playlist.c
@@ -280,7 +280,7 @@ static int vlclua_playlist_get( lua_State *L )
                 }
             }
 #else
-# warning Don't access playlist iternal, broken code here.
+# warning "Don't access playlist iternal, broken code here."
             abort();
 #endif
             if( !p_item )