[vlc-commits] Add required LIBVLC_USED and LIBVLC_MALLOC.

Rémi Duraffort git at videolan.org
Wed Feb 23 23:53:21 CET 2011


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Feb 23 23:45:26 2011 +0100| [add821b0eaeb2922d9d5191b7be1f1a833d4d245] | committer: Rémi Duraffort

Add required LIBVLC_USED and LIBVLC_MALLOC.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=add821b0eaeb2922d9d5191b7be1f1a833d4d245
---

 include/vlc_acl.h           |    4 ++--
 include/vlc_configuration.h |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/vlc_acl.h b/include/vlc_acl.h
index df50788..37738b0 100644
--- a/include/vlc_acl.h
+++ b/include/vlc_acl.h
@@ -27,9 +27,9 @@
 
 
 VLC_EXPORT( int, ACL_Check, ( vlc_acl_t *p_acl, const char *psz_ip ) );
-VLC_EXPORT( vlc_acl_t *, ACL_Create, ( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED );
+VLC_EXPORT( vlc_acl_t *, ACL_Create, ( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED LIBVLC_MALLOC );
 #define ACL_Create(a, b) ACL_Create(VLC_OBJECT(a), b)
-VLC_EXPORT( vlc_acl_t *, ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED );
+VLC_EXPORT( vlc_acl_t *, ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED LIBVLC_MALLOC );
 #define ACL_Duplicate(a,b) ACL_Duplicate(VLC_OBJECT(a),b)
 VLC_EXPORT( void, ACL_Destroy, ( vlc_acl_t *p_acl ) );
 
diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 79e2eaf..a19d71b 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -195,7 +195,7 @@ VLC_EXPORT( int64_t, config_GetInt,  (vlc_object_t *, const char *) LIBVLC_USED
 VLC_EXPORT( void,   config_PutInt,   (vlc_object_t *, const char *, int64_t) );
 VLC_EXPORT( float,  config_GetFloat, (vlc_object_t *, const char *) LIBVLC_USED );
 VLC_EXPORT( void,   config_PutFloat, (vlc_object_t *, const char *, float) );
-VLC_EXPORT( char *, config_GetPsz,   (vlc_object_t *, const char *) LIBVLC_USED );
+VLC_EXPORT( char *, config_GetPsz,   (vlc_object_t *, const char *) LIBVLC_USED LIBVLC_MALLOC );
 VLC_EXPORT( void,   config_PutPsz,   (vlc_object_t *, const char *, const char *) );
 
 VLC_EXPORT( int,    config_SaveConfigFile, ( vlc_object_t *, const char * ) );
@@ -203,8 +203,8 @@ VLC_EXPORT( int,    config_SaveConfigFile, ( vlc_object_t *, const char * ) );
 VLC_EXPORT( void,   config_ResetAll, ( vlc_object_t * ) );
 #define config_ResetAll(a) config_ResetAll(VLC_OBJECT(a))
 
-VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED );
-VLC_EXPORT(char *, config_GetDataDir, ( vlc_object_t * ) LIBVLC_USED);
+VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED LIBVLC_MALLOC );
+VLC_EXPORT(char *, config_GetDataDir, ( vlc_object_t * ) LIBVLC_USED LIBVLC_MALLOC );
 #define config_GetDataDir(a) config_GetDataDir(VLC_OBJECT(a))
 VLC_EXPORT(const char *, config_GetLibDir, ( void ) LIBVLC_USED);
 VLC_EXPORT(const char *, config_GetConfDir, ( void ) LIBVLC_USED);
@@ -226,7 +226,7 @@ typedef enum vlc_userdir
     VLC_VIDEOS_DIR,
 } vlc_userdir_t;
 
-VLC_EXPORT(char *, config_GetUserDir, ( vlc_userdir_t ) LIBVLC_USED);
+VLC_EXPORT(char *, config_GetUserDir, ( vlc_userdir_t ) LIBVLC_USED LIBVLC_MALLOC );
 
 VLC_EXPORT( void, config_AddIntf,    ( vlc_object_t *, const char * ) );
 VLC_EXPORT( void, config_RemoveIntf, ( vlc_object_t *, const char * ) );
@@ -287,7 +287,7 @@ VLC_EXPORT( void, config_ChainDestroy, ( config_chain_t * ) );
 /**
  * This function will duplicate a linked list of config_chain_t
  */
-VLC_EXPORT( config_chain_t *, config_ChainDuplicate, ( const config_chain_t * ) );
+VLC_EXPORT( config_chain_t *, config_ChainDuplicate, ( const config_chain_t * ) LIBVLC_USED LIBVLC_MALLOC );
 
 /**
  * This function will unescape a string in place and will return a pointer on
@@ -309,7 +309,7 @@ VLC_EXPORT( char *, config_StringUnescape, ( char *psz_string ) );
  *
  * The escaped characters are ' " and \
  */
-VLC_EXPORT( char *, config_StringEscape, ( const char *psz_string ) LIBVLC_USED);
+VLC_EXPORT( char *, config_StringEscape, ( const char *psz_string ) LIBVLC_USED LIBVLC_MALLOC );
 
 # ifdef __cplusplus
 }



More information about the vlc-commits mailing list