From 32376dc26ea8c10dce202deee1ee239a5716c1d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Duraffort?= <ivoire@videolan.org>
Date: Tue, 11 Mar 2008 22:18:20 +0100
Subject: [PATCH] Remove useless test before a free. if( bla ) free( bla ); =>
 free( bla );

---
 include/vlc_arrays.h |  2 +-
 include/vlc_input.h  | 30 ++++++++++++------------------
 include/vlc_meta.h   |  4 ++--
 include/vlc_url.h    |  4 ++--
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h
index 0670ef79ef..ece3173c37 100644
--- a/include/vlc_arrays.h
+++ b/include/vlc_arrays.h
@@ -83,7 +83,7 @@
 
 #define TAB_CLEAN( count, tab )                 \
   do {                                          \
-    if( tab ) free( tab );                      \
+    free( tab );                                \
     (count)= 0;                                 \
     (tab)= NULL;                                \
   } while(0)
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 441f263b28..9ec80381c2 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -121,7 +121,7 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
 
 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 );
 }
 
@@ -171,10 +171,7 @@ static inline void input_ItemClean( input_item_t *p_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++ )
@@ -193,15 +190,13 @@ static inline void input_ItemClean( input_item_t *p_i )
         {
             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 );
 
-        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 );
@@ -263,8 +258,8 @@ static inline char * input_item_GetURI( input_item_t * p_i )
 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 );
 }
 
@@ -439,7 +434,7 @@ static inline seekpoint_t *vlc_seekpoint_New( void )
 static inline void vlc_seekpoint_Delete( seekpoint_t *point )
 {
     if( !point ) return;
-    if( point->psz_name ) free( point->psz_name );
+    free( point->psz_name );
     free( point );
 }
 
@@ -490,13 +485,13 @@ static inline void vlc_input_title_Delete( input_title_t *t )
     if( t == NULL )
         return;
 
-    if( t->psz_name ) free( t->psz_name );
+    free( t->psz_name );
     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] );
     }
-    if( t->seekpoint ) free( t->seekpoint );
+    free( t->seekpoint );
     free( t );
 }
 
@@ -570,8 +565,7 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
     free( a->psz_name );
     free( a->psz_mime );
     free( a->psz_description );
-    if( a->p_data )
-        free( a->p_data );
+    free( a->p_data );
     free( a );
 }
 /*****************************************************************************
diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 242f8afd91..843266e620 100644
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -95,7 +95,7 @@ struct vlc_meta_t
 
 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;
 }
 
@@ -145,7 +145,7 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
     {
         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] );
         }
     }
diff --git a/include/vlc_url.h b/include/vlc_url.h
index 3d26ba8dd7..42fe23eb13 100644
--- a/include/vlc_url.h
+++ b/include/vlc_url.h
@@ -182,8 +182,8 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_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;
-- 
2.39.2