block_mmap_Alloc: commoditize block allocation from mmap

[vlc] / include / vlc_vlm.h

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index e1bffe57e82dc1ec1a7c12cdbb07f83d5e91263c..004e862001d8aa3b8ceb2bf6120b8c6219482ad8 100644 (file)
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -157,7 +157,7 @@ VLC_EXPORT( void,      vlm_Delete, ( vlm_t * ) );
 VLC_EXPORT( int,       vlm_ExecuteCommand, ( vlm_t *, const char *, vlm_message_t ** ) );
 VLC_EXPORT( int,       vlm_Control, ( vlm_t *p_vlm, int i_query, ... ) );
 
-VLC_EXPORT( vlm_message_t *, vlm_MessageNew, ( const char *, const char *, ... ) );
+VLC_EXPORT( vlm_message_t *, vlm_MessageNew, ( const char *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
 VLC_EXPORT( vlm_message_t *, vlm_MessageAdd, ( vlm_message_t *, vlm_message_t * ) );
 VLC_EXPORT( void,            vlm_MessageDelete, ( vlm_message_t * ) );
 
@@ -187,9 +187,9 @@ static inline void vlm_media_Copy( vlm_media_t *p_dst, vlm_media_t *p_src )
         p_dst->psz_name = strdup( p_src->psz_name );
 
     for( i = 0; i < p_src->i_input; i++ )
-        TAB_APPEND( p_dst->i_input, p_dst->ppsz_input, strdup(p_src->ppsz_input[i]) );
+        TAB_APPEND_CPP( char, p_dst->i_input, p_dst->ppsz_input, strdup(p_src->ppsz_input[i]) );
     for( i = 0; i < p_src->i_option; i++ )
-        TAB_APPEND( p_dst->i_option, p_dst->ppsz_option, strdup(p_src->ppsz_option[i]) );
+        TAB_APPEND_CPP( char, p_dst->i_option, p_dst->ppsz_option, strdup(p_src->ppsz_option[i]) );
 
     if( p_src->psz_output )
         p_dst->psz_output = strdup( p_src->psz_output );
@@ -229,7 +229,7 @@ static inline void vlm_media_Clean( vlm_media_t *p_media )
 }
 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;
@@ -265,7 +265,7 @@ static inline void vlm_media_instance_Clean( vlm_media_instance_t *p_instance )
 }
 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;