Remove useless test (one more time).

[vlc] / include / vlc_vlm.h

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index 563f2b4cbe27da5964b3f708b571891052fb39e3..99e33c31f4deb79162c0f09e260e5221c93b1018 100644 (file)
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -29,10 +29,6 @@
 #ifndef _VLC_VLM_H
 #define _VLC_VLM_H 1
 
-#ifdef __cpluplus
-extern "C" {
-#endif
-
 #include <vlc_input.h>
 
 /* VLM media */
@@ -151,6 +147,10 @@ struct vlm_message_t
 };
 
 
+#ifdef __cpluplus
+extern "C" {
+#endif
+
 #define vlm_New( a ) __vlm_New( VLC_OBJECT(a) )
 VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) );
 VLC_EXPORT( void,      vlm_Delete, ( vlm_t * ) );
@@ -208,8 +208,7 @@ static inline void vlm_media_Copy( vlm_media_t *p_dst, vlm_media_t *p_src )
 static inline void vlm_media_Clean( vlm_media_t *p_media )
 {
     int i;
-    if( p_media->psz_name )
-        free( p_media->psz_name );
+    free( p_media->psz_name );
 
     for( i = 0; i < p_media->i_input; i++ )
         free( p_media->ppsz_input[i]) ;
@@ -219,17 +218,13 @@ static inline void vlm_media_Clean( vlm_media_t *p_media )
         free( p_media->ppsz_option[i]) ;
     TAB_CLEAN(p_media->i_option, p_media->ppsz_option );
 
-    if( p_media->psz_output )
-        free( p_media->psz_output );
+    free( p_media->psz_output );
     if( p_media->b_vod )
-    {
-        if( p_media->vod.psz_mux )
-            free( p_media->vod.psz_mux );
-    }
+        free( p_media->vod.psz_mux );
 }
 static inline vlm_media_t *vlm_media_New(void)
 {
-    vlm_media_t *p_media = malloc( sizeof(vlm_media_t) );
+    vlm_media_t *p_media = (vlm_media_t *)malloc( sizeof(vlm_media_t) );
     if( p_media )
         vlm_media_Init( p_media );
     return p_media;
@@ -260,12 +255,11 @@ static inline void vlm_media_instance_Init( vlm_media_instance_t *p_instance )
 }
 static inline void vlm_media_instance_Clean( vlm_media_instance_t *p_instance )
 {
-    if( p_instance->psz_name )
-        free( p_instance->psz_name );
+    free( p_instance->psz_name );
 }
 static inline vlm_media_instance_t *vlm_media_instance_New(void)
 {
-    vlm_media_instance_t *p_instance = malloc( sizeof(vlm_media_instance_t) );
+    vlm_media_instance_t *p_instance = (vlm_media_instance_t *) malloc( sizeof(vlm_media_instance_t) );
     if( p_instance )
         vlm_media_instance_Init( p_instance );
     return p_instance;