Commit 92f1b3ae authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Rename LIBVLC_* function attributes to VLC_* within plugin API

parent e4b19d0a
......@@ -151,7 +151,7 @@ static inline void access_InitFields( access_t *p_a )
* This function will return the parent input of this access.
* It is retained. It can return NULL.
*/
VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) LIBVLC_USED;
VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
#define ACCESS_SET_CALLBACKS( read, block, control, seek ) \
p_access->pf_read = read; \
......
......@@ -27,9 +27,9 @@
VLC_API int ACL_Check( vlc_acl_t *p_acl, const char *psz_ip );
VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) VLC_USED VLC_MALLOC;
#define ACL_Create(a, b) ACL_Create(VLC_OBJECT(a), b)
VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) VLC_USED VLC_MALLOC;
#define ACL_Duplicate(a,b) ACL_Duplicate(VLC_OBJECT(a),b)
VLC_API void ACL_Destroy( vlc_acl_t *p_acl );
......
......@@ -256,7 +256,7 @@ static const uint32_t pi_vlc_chan_order_wg4[] =
* Prototypes
*****************************************************************************/
VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) LIBVLC_USED;
VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) VLC_USED;
/**
* This function computes the reordering needed to go from pi_chan_order_in to
......@@ -300,13 +300,13 @@ static inline unsigned aout_FormatNbChannels(const audio_sample_format_t *fmt)
return popcount(fmt->i_physical_channels & AOUT_CHAN_PHYSMASK);
}
VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) LIBVLC_USED;
VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) VLC_USED;
VLC_API void aout_FormatPrepare( audio_sample_format_t * p_format );
VLC_API void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format );
VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) LIBVLC_USED;
VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED;
VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) LIBVLC_USED;
VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) LIBVLC_USED;
VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) VLC_USED;
VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) VLC_USED;
/* From intf.c : */
VLC_API void aout_VolumeSoftInit( aout_instance_t * );
......@@ -330,7 +330,7 @@ VLC_API void aout_EnableFilter(vlc_object_t *, const char *, bool );
aout_EnableFilter( VLC_OBJECT(o), n, b )
/* */
VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) LIBVLC_USED;
VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) VLC_USED;
# ifdef __cplusplus
}
......
......@@ -137,12 +137,12 @@ struct block_t
* - block_Duplicate : create a copy of a block.
****************************************************************************/
VLC_API void block_Init( block_t *, void *, size_t );
VLC_API block_t * block_Alloc( size_t ) LIBVLC_USED;
VLC_API block_t * block_Realloc( block_t *, ssize_t i_pre, size_t i_body ) LIBVLC_USED;
VLC_API block_t * block_Alloc( size_t ) VLC_USED;
VLC_API block_t * block_Realloc( block_t *, ssize_t i_pre, size_t i_body ) VLC_USED;
#define block_New( dummy, size ) block_Alloc(size)
LIBVLC_USED
VLC_USED
static inline block_t *block_Duplicate( block_t *p_block )
{
block_t *p_dup = block_Alloc( p_block->i_buffer );
......@@ -165,9 +165,9 @@ static inline void block_Release( block_t *p_block )
p_block->pf_release( p_block );
}
VLC_API block_t * block_heap_Alloc(void *, void *, size_t) LIBVLC_USED;
VLC_API block_t * block_mmap_Alloc(void *addr, size_t length) LIBVLC_USED;
VLC_API block_t * block_File(int fd) LIBVLC_USED;
VLC_API block_t * block_heap_Alloc(void *, void *, size_t) VLC_USED;
VLC_API block_t * block_mmap_Alloc(void *addr, size_t length) VLC_USED;
VLC_API block_t * block_File(int fd) VLC_USED;
static inline void block_Cleanup (void *block)
{
......@@ -306,15 +306,15 @@ static inline block_t *block_ChainGather( block_t *p_list )
* block_FifoGet and block_FifoShow are cancellation points.
****************************************************************************/
VLC_API block_fifo_t * block_FifoNew( void ) LIBVLC_USED;
VLC_API block_fifo_t * block_FifoNew( void ) VLC_USED;
VLC_API void block_FifoRelease( block_fifo_t * );
VLC_API void block_FifoPace( block_fifo_t *fifo, size_t max_depth, size_t max_size );
VLC_API void block_FifoEmpty( block_fifo_t * );
VLC_API size_t block_FifoPut( block_fifo_t *, block_t * );
VLC_API void block_FifoWake( block_fifo_t * );
VLC_API block_t * block_FifoGet( block_fifo_t * ) LIBVLC_USED;
VLC_API block_t * block_FifoGet( block_fifo_t * ) VLC_USED;
VLC_API block_t * block_FifoShow( block_fifo_t * );
size_t block_FifoSize( const block_fifo_t *p_fifo ) LIBVLC_USED;
VLC_API size_t block_FifoCount( const block_fifo_t *p_fifo ) LIBVLC_USED;
size_t block_FifoSize( const block_fifo_t *p_fifo ) VLC_USED;
VLC_API size_t block_FifoCount( const block_fifo_t *p_fifo ) VLC_USED;
#endif /* VLC_BLOCK_H */
......@@ -37,7 +37,7 @@ typedef struct block_bytestream_t
/*****************************************************************************
* block_bytestream_t management
*****************************************************************************/
LIBVLC_USED
VLC_USED
static inline block_bytestream_t block_BytestreamInit( void )
{
block_bytestream_t bytestream;
......@@ -101,7 +101,7 @@ static inline void block_BytestreamPush( block_bytestream_t *p_bytestream,
if( !p_bytestream->p_block ) p_bytestream->p_block = p_block;
}
LIBVLC_USED
VLC_USED
static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream )
{
block_t *p_block;
......
......@@ -32,27 +32,27 @@
/* iconv wrappers (defined in src/extras/libc.c) */
typedef void *vlc_iconv_t;
VLC_API vlc_iconv_t vlc_iconv_open( const char *, const char * ) LIBVLC_USED;
VLC_API size_t vlc_iconv( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED;
VLC_API vlc_iconv_t vlc_iconv_open( const char *, const char * ) VLC_USED;
VLC_API size_t vlc_iconv( vlc_iconv_t, const char **, size_t *, char **, size_t * ) VLC_USED;
VLC_API int vlc_iconv_close( vlc_iconv_t );
#include <stdarg.h>
VLC_API void LocaleFree( const char * );
VLC_API char * FromLocale( const char * ) LIBVLC_USED;
VLC_API char * FromLocaleDup( const char * ) LIBVLC_USED;
VLC_API char * ToLocale( const char * ) LIBVLC_USED;
VLC_API char * ToLocaleDup( const char * ) LIBVLC_USED;
VLC_API char * FromLocale( const char * ) VLC_USED;
VLC_API char * FromLocaleDup( const char * ) VLC_USED;
VLC_API char * ToLocale( const char * ) VLC_USED;
VLC_API char * ToLocaleDup( const char * ) VLC_USED;
VLC_API int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap );
VLC_API int utf8_fprintf( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 );
VLC_API char * vlc_strcasestr(const char *, const char *) LIBVLC_USED;
VLC_API int utf8_fprintf( FILE *, const char *, ... ) VLC_FORMAT( 2, 3 );
VLC_API char * vlc_strcasestr(const char *, const char *) VLC_USED;
VLC_API char * EnsureUTF8( char * );
VLC_API const char * IsUTF8( const char * ) LIBVLC_USED;
VLC_API const char * IsUTF8( const char * ) VLC_USED;
#ifdef WIN32
LIBVLC_USED
VLC_USED
static inline char *FromWide (const wchar_t *wide)
{
size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
......@@ -66,7 +66,7 @@ static inline char *FromWide (const wchar_t *wide)
return out;
}
LIBVLC_USED
VLC_USED
static inline wchar_t *ToWide (const char *utf8)
{
int len = MultiByteToWideChar (CP_UTF8, 0, utf8, -1, NULL, 0);
......@@ -108,13 +108,13 @@ static inline char *FromLatin1 (const char *latin)
return utf8 ? utf8 : str;
}
VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) LIBVLC_USED;
VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) LIBVLC_USED;
VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) VLC_USED;
VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) VLC_USED;
VLC_API double us_strtod( const char *, char ** ) LIBVLC_USED;
VLC_API float us_strtof( const char *, char ** ) LIBVLC_USED;
VLC_API double us_atof( const char * ) LIBVLC_USED;
VLC_API double us_strtod( const char *, char ** ) VLC_USED;
VLC_API float us_strtof( const char *, char ** ) VLC_USED;
VLC_API double us_atof( const char * ) VLC_USED;
VLC_API int us_vasprintf( char **, const char *, va_list );
VLC_API int us_asprintf( char **, const char *, ... ) LIBVLC_USED;
VLC_API int us_asprintf( char **, const char *, ... ) VLC_USED;
#endif
......@@ -180,7 +180,7 @@ struct encoder_t
* buffer. You have to release it using decoder_DeletePicture or by returning
* it to the caller as a pf_decode_video return value.
*/
VLC_API picture_t * decoder_NewPicture( decoder_t * ) LIBVLC_USED;
VLC_API picture_t * decoder_NewPicture( decoder_t * ) VLC_USED;
/**
* This function will release a picture create by decoder_NewPicture.
......@@ -204,7 +204,7 @@ VLC_API void decoder_UnlinkPicture( decoder_t *, picture_t * );
* output buffer. You have to release it using decoder_DeleteAudioBuffer
* or by returning it to the caller as a pf_decode_audio return value.
*/
VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) LIBVLC_USED;
VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
/**
* This function will release a audio buffer created by decoder_NewAudioBuffer.
......@@ -216,7 +216,7 @@ VLC_API void decoder_DeleteAudioBuffer( decoder_t *, aout_buffer_t *p_buffer );
* buffer. You have to release it using decoder_DeleteSubpicture or by returning
* it to the caller as a pf_decode_sub return value.
*/
VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) LIBVLC_USED;
VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) VLC_USED;
/**
* This function will release a subpicture created by decoder_NewSubicture.
......@@ -235,12 +235,12 @@ VLC_API int decoder_GetInputAttachments( decoder_t *, input_attachment_t ***ppp_
* to mdate().
* You MUST use it *only* for gathering statistics about speed.
*/
VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) LIBVLC_USED;
VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) VLC_USED;
/**
* This function returns the current input rate.
* You MUST use it *only* for gathering statistics about speed.
*/
VLC_API int decoder_GetDisplayRate( decoder_t * ) LIBVLC_USED;
VLC_API int decoder_GetDisplayRate( decoder_t * ) VLC_USED;
#endif /* _VLC_CODEC_H */
......@@ -37,13 +37,13 @@
/*****************************************************************************
* Prototypes
*****************************************************************************/
VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) LIBVLC_USED;
VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) VLC_USED;
VLC_API void decoder_SynchroRelease( decoder_synchro_t * );
VLC_API void decoder_SynchroReset( decoder_synchro_t * );
VLC_API bool decoder_SynchroChoose( decoder_synchro_t *, int, int, bool );
VLC_API void decoder_SynchroTrash( decoder_synchro_t * );
VLC_API void decoder_SynchroDecode( decoder_synchro_t * );
VLC_API void decoder_SynchroEnd( decoder_synchro_t *, int, bool );
VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) LIBVLC_USED;
VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) VLC_USED;
VLC_API void decoder_SynchroNewPicture( decoder_synchro_t *, int, int, mtime_t, mtime_t, bool );
......@@ -75,22 +75,22 @@
/* Format string sanity checks */
#ifdef __GNUC__
# if defined( _WIN32 ) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) )
# define LIBVLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
# define VLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
# else
# define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
# define VLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
# endif
# define LIBVLC_FORMAT_ARG(x) __attribute__ ((format_arg(x)))
# define VLC_FORMAT_ARG(x) __attribute__ ((format_arg(x)))
# if __GNUC__ > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ >= 4))
# define LIBVLC_USED __attribute__ ((warn_unused_result))
# define VLC_USED __attribute__ ((warn_unused_result))
# else
# define LIBVLC_USED
# define VLC_USED
# endif
# define LIBVLC_MALLOC __attribute__ ((malloc))
# define VLC_MALLOC __attribute__ ((malloc))
#else
# define LIBVLC_FORMAT(x,y)
# define LIBVLC_FORMAT_ARG(x)
# define LIBVLC_USED
# define LIBVLC_MALLOC
# define VLC_FORMAT(x,y)
# define VLC_FORMAT_ARG(x)
# define VLC_USED
# define VLC_MALLOC
#endif
/* Branch prediction */
......@@ -103,27 +103,27 @@
#endif
#if defined(__GNUC__) && !defined __cplusplus
# define LIBVLC_DEPRECATED __attribute__((deprecated))
# define VLC_DEPRECATED __attribute__((deprecated))
#else
# define LIBVLC_DEPRECATED
# define VLC_DEPRECATED
#endif
/* Linkage */
#ifdef __cplusplus
# define LIBVLC_EXTERN extern "C"
# define VLC_EXTERN extern "C"
#else
# define LIBVLC_EXTERN
# define VLC_EXTERN
#endif
#if defined (WIN32) && defined (DLL_EXPORT)
# define LIBVLC_EXPORT __declspec(dllexport)
# define VLC_EXPORT __declspec(dllexport)
#elif defined (__GNUC__) && (__GNUC__ >= 4)
# define LIBVLC_EXPORT __attribute__((visibility("default")))
# define VLC_EXPORT __attribute__((visibility("default")))
#else
# define LIBVLC_EXPORT
# define VLC_EXPORT
#endif
#define VLC_API LIBVLC_EXTERN LIBVLC_EXPORT
#define VLC_API VLC_EXTERN VLC_EXPORT
/*****************************************************************************
......@@ -582,7 +582,7 @@ VLC_API void vlc_release(gc_object_t *);
# define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
#endif
LIBVLC_USED
VLC_USED
static inline int64_t GCD ( int64_t a, int64_t b )
{
while( b )
......@@ -595,7 +595,7 @@ static inline int64_t GCD ( int64_t a, int64_t b )
}
/* function imported from libavutil/common.h */
LIBVLC_USED
VLC_USED
static inline uint8_t clip_uint8_vlc( int32_t a )
{
if( a&(~255) ) return (-a)>>31;
......@@ -603,7 +603,7 @@ static inline uint8_t clip_uint8_vlc( int32_t a )
}
/* Count leading zeroes */
LIBVLC_USED
VLC_USED
static inline unsigned clz (unsigned x)
{
#ifdef __GNUC_
......@@ -626,7 +626,7 @@ static inline unsigned clz (unsigned x)
#define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8))
/* Bit weight */
LIBVLC_USED
VLC_USED
static inline unsigned popcount (unsigned x)
{
#ifdef __GNUC_
......@@ -647,20 +647,20 @@ static inline unsigned popcount (unsigned x)
#define EMPTY_STR(str) (!str || !*str)
VLC_API char const * vlc_error( int ) LIBVLC_USED;
VLC_API char const * vlc_error( int ) VLC_USED;
#include <vlc_arrays.h>
/* MSB (big endian)/LSB (little endian) conversions - network order is always
* MSB, and should be used for both network communications and files. */
LIBVLC_USED
VLC_USED
static inline uint16_t U16_AT( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
return ( ((uint16_t)p[0] << 8) | p[1] );
}
LIBVLC_USED
VLC_USED
static inline uint32_t U32_AT( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
......@@ -668,7 +668,7 @@ static inline uint32_t U32_AT( const void * _p )
| ((uint32_t)p[2] << 8) | p[3] );
}
LIBVLC_USED
VLC_USED
static inline uint64_t U64_AT( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
......@@ -678,14 +678,14 @@ static inline uint64_t U64_AT( const void * _p )
| ((uint64_t)p[6] << 8) | p[7] );
}
LIBVLC_USED
VLC_USED
static inline uint16_t GetWLE( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
return ( ((uint16_t)p[1] << 8) | p[0] );
}
LIBVLC_USED
VLC_USED
static inline uint32_t GetDWLE( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
......@@ -693,7 +693,7 @@ static inline uint32_t GetDWLE( const void * _p )
| ((uint32_t)p[1] << 8) | p[0] );
}
LIBVLC_USED
VLC_USED
static inline uint64_t GetQWLE( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
......@@ -756,7 +756,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
#define ntoh16(i) ntohs(i)
#define ntoh32(i) ntohl(i)
LIBVLC_USED
VLC_USED
static inline uint64_t ntoh64 (uint64_t ll)
{
union { uint64_t qw; uint8_t b[16]; } v = { ll };
......@@ -829,10 +829,10 @@ static inline uint64_t ntoh64 (uint64_t ll)
VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t );
VLC_API void * vlc_memalign( void **base, size_t alignment, size_t size ) LIBVLC_USED;
VLC_API void * vlc_memalign( void **base, size_t alignment, size_t size ) VLC_USED;
/* execve wrapper (defined in src/extras/libc.c) */
VLC_API int vlc_execve( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED;
VLC_API int vlc_execve( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) VLC_USED;
#define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
VLC_API void vlc_tdestroy( void *, void (*)(void *) );
......@@ -844,12 +844,12 @@ VLC_API void * vlc_memset( void *, int, size_t );
/*****************************************************************************
* I18n stuff
*****************************************************************************/
VLC_API char * vlc_gettext( const char *msgid ) LIBVLC_FORMAT_ARG(1);
VLC_API char * vlc_gettext( const char *msgid ) VLC_FORMAT_ARG(1);
#define vlc_pgettext( ctx, id ) \
vlc_pgettext_aux( ctx "\004" id, id )
LIBVLC_FORMAT_ARG(2)
VLC_FORMAT_ARG(2)
static inline const char *vlc_pgettext_aux( const char *ctx, const char *id )
{
const char *tr = vlc_gettext( ctx );
......@@ -878,9 +878,9 @@ static inline void *xrealloc (void *ptr, size_t len)
/*****************************************************************************
* libvlc features
*****************************************************************************/
VLC_API const char * VLC_CompileBy( void ) LIBVLC_USED;
VLC_API const char * VLC_CompileHost( void ) LIBVLC_USED;
VLC_API const char * VLC_Compiler( void ) LIBVLC_USED;
VLC_API const char * VLC_CompileBy( void ) VLC_USED;
VLC_API const char * VLC_CompileHost( void ) VLC_USED;
VLC_API const char * VLC_Compiler( void ) VLC_USED;
/*****************************************************************************
* Additional vlc stuff
......
......@@ -280,7 +280,7 @@ static const struct config_category_t categories_array[] =
{ -1, NULL, NULL }
};
LIBVLC_USED
VLC_USED
static inline const char *config_CategoryNameGet( int i_value )
{
int i = 0;
......@@ -295,7 +295,7 @@ static inline const char *config_CategoryNameGet( int i_value )
return NULL;
}
LIBVLC_USED
VLC_USED
static inline const char *config_CategoryHelpGet( int i_value )
{
int i = 0;
......
......@@ -188,12 +188,12 @@ struct module_config_t
* Prototypes - these methods are used to get, set or manipulate configuration
* data.
*****************************************************************************/
VLC_API int config_GetType(vlc_object_t *, const char *) LIBVLC_USED;
VLC_API int64_t config_GetInt(vlc_object_t *, const char *) LIBVLC_USED;
VLC_API int config_GetType(vlc_object_t *, const char *) VLC_USED;
VLC_API int64_t config_GetInt(vlc_object_t *, const char *) VLC_USED;
VLC_API void config_PutInt(vlc_object_t *, const char *, int64_t);
VLC_API float config_GetFloat(vlc_object_t *, const char *) LIBVLC_USED;
VLC_API float config_GetFloat(vlc_object_t *, const char *) VLC_USED;
VLC_API void config_PutFloat(vlc_object_t *, const char *, float);
VLC_API char * config_GetPsz(vlc_object_t *, const char *) LIBVLC_USED LIBVLC_MALLOC;
VLC_API char * config_GetPsz(vlc_object_t *, const char *) VLC_USED VLC_MALLOC;
VLC_API void config_PutPsz(vlc_object_t *, const char *, const char *);
VLC_API int config_SaveConfigFile( vlc_object_t * );
......@@ -202,11 +202,11 @@ VLC_API int config_SaveConfigFile( vlc_object_t * );
VLC_API void config_ResetAll( vlc_object_t * );
#define config_ResetAll(a) config_ResetAll(VLC_OBJECT(a))
VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) LIBVLC_USED;
VLC_API char * config_GetDataDir( vlc_object_t * ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) VLC_USED;
VLC_API char * config_GetDataDir( vlc_object_t * ) VLC_USED VLC_MALLOC;
#define config_GetDataDir(a) config_GetDataDir(VLC_OBJECT(a))
VLC_API const char * config_GetLibDir( void ) LIBVLC_USED;
VLC_API const char * config_GetConfDir( void ) LIBVLC_USED;
VLC_API const char * config_GetLibDir( void ) VLC_USED;
VLC_API const char * config_GetConfDir( void ) VLC_USED;
typedef enum vlc_userdir
{
......@@ -225,11 +225,11 @@ typedef enum vlc_userdir
VLC_VIDEOS_DIR,
} vlc_userdir_t;
VLC_API char * config_GetUserDir( vlc_userdir_t ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API char * config_GetUserDir( vlc_userdir_t ) VLC_USED VLC_MALLOC;
VLC_API void config_AddIntf( vlc_object_t *, const char * );
VLC_API void config_RemoveIntf( vlc_object_t *, const char * );
VLC_API bool config_ExistIntf( vlc_object_t *, const char * ) LIBVLC_USED;
VLC_API bool config_ExistIntf( vlc_object_t *, const char * ) VLC_USED;
#define config_GetType(a,b) config_GetType(VLC_OBJECT(a),b)
#define config_GetInt(a,b) config_GetInt(VLC_OBJECT(a),b)
......@@ -275,7 +275,7 @@ VLC_API void config_ChainParse( vlc_object_t *, const char *psz_prefix, const ch
*
* The options values are unescaped using config_StringUnescape.
*/
VLC_API char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char *psz_string ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char *psz_string ) VLC_USED VLC_MALLOC;
/**
* This function will release a linked list of config_chain_t
......@@ -286,7 +286,7 @@ VLC_API void config_ChainDestroy( config_chain_t * );
/**
* This function will duplicate a linked list of config_chain_t
*/
VLC_API config_chain_t * config_ChainDuplicate( const config_chain_t * ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API config_chain_t * config_ChainDuplicate( const config_chain_t * ) VLC_USED VLC_MALLOC;
/**
* This function will unescape a string in place and will return a pointer on
......@@ -308,7 +308,7 @@ VLC_API char * config_StringUnescape( char *psz_string );
*
* The escaped characters are ' " and \
*/
VLC_API char * config_StringEscape( const char *psz_string ) LIBVLC_USED LIBVLC_MALLOC;
VLC_API char * config_StringEscape( const char *psz_string ) VLC_USED VLC_MALLOC;
# ifdef __cplusplus
}
......
......@@ -167,7 +167,7 @@ VLC_API int demux_vaControlHelper( stream_t *, int64_t i_start, int64_t i_end, i
* Miscellaneous helpers for demuxers
*************************************************************************/
LIBVLC_USED
VLC_USED
static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension )
{
if( !p_demux->psz_file )
......@@ -179,7 +179,7 @@ static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_exte
return true;
}
LIBVLC_USED
VLC_USED
static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name )
{
if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_name ) )
......@@ -194,7 +194,7 @@ static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name )
* The provided es_format_t will be cleaned on error or by
* demux_PacketizerDestroy.
*/
VLC_API decoder_t * demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) LIBVLC_USED;
VLC_API decoder_t * demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) VLC_USED;
/**
* This function will destroy a packetizer create by demux_PacketizerNew.
......@@ -205,7 +205,7 @@ VLC_API void demux_PacketizerDestroy( decoder_t *p_packetizer );
* This function will return the parent input of this demux.
* It is retained. Can return NULL.
*/
VLC_API input_thread_t * demux_GetParentInput( demux_t *p_demux ) LIBVLC_USED;
VLC_API input_thread_t * demux_GetParentInput( demux_t *p_demux ) VLC_USED;
/* */
#define DEMUX_INIT_COMMON() do { \
......
......@@ -39,7 +39,7 @@ typedef struct dialog_fatal_t
VLC_API void dialog_VFatal(vlc_object_t *, bool, const char *, const char *, va_list);
static inline LIBVLC_FORMAT(3, 4)
static inline VLC_FORMAT(3, 4)
void dialog_Fatal (vlc_object_t *obj, const char *title, const char *fmt, ...)
{
va_list ap;
......@@ -51,7 +51,7 @@ void dialog_Fatal (vlc_object_t *obj, const char *title, const char *fmt, ...)
#define dialog_Fatal(o, t, ...) \
dialog_Fatal(VLC_OBJECT(o), t, __VA_ARGS__)
static inline LIBVLC_FORMAT(3, 4)
static inline VLC_FORMAT(3, 4)
void dialog_FatalWait (vlc_object_t *obj, const char *title,
const char *fmt, ...){
va_list ap;
......@@ -74,7 +74,7 @@ typedef struct dialog_login_t
char **password;
} dialog_login_t;
VLC_API void dialog_Login(vlc_object_t *, char **, char **, const char *, const char *, ...) LIBVLC_FORMAT (5, 6);
VLC_API void dialog_Login(vlc_object_t *, char **, char **, const char *, const char *, ...) VLC_FORMAT (5, 6);
#define dialog_Login(o, u, p, t, ...) \
dialog_Login(VLC_OBJECT(o), u, p, t, __VA_ARGS__)
......@@ -107,7 +107,7 @@ typedef struct dialog_progress_bar_t
void *p_sys;
} dialog_progress_bar_t;
VLC_API dialog_progress_bar_t * dialog_ProgressCreate(vlc_object_t *, const char *, const char *, const char *) LIBVLC_USED;
VLC_API dialog_progress_bar_t * dialog_ProgressCreate(vlc_object_t *, const char *, const char *, const char *) VLC_USED;
#define dialog_ProgressCreate(o, t, m, c) \
dialog_ProgressCreate(VLC_OBJECT(o), t, m, c)
VLC_API void dialog_ProgressDestroy(dialog_progress_bar_t *);
......
......@@ -73,7 +73,7 @@ VLC_API void vlc_epg_AddEvent(vlc_epg_t *p_epg, int64_t i_start, int i_duration,
*
* You must call vlc_epg_Delete to release the associated resource.
*/
VLC_API vlc_epg_t * vlc_epg_New(const char *psz_name) LIBVLC_USED;
VLC_API vlc_epg_t * vlc_epg_New(const char *psz_name) VLC_USED;
/**
* It releases a vlc_epg_t*.
......
......@@ -104,7 +104,7 @@ struct es_out_t
es_out_sys_t *p_sys;
};
LIBVLC_USED
VLC_USED
static inline es_out_id_t * es_out_Add( es_out_t *out, const es_format_t *fmt )
{
return out->pf_add( out, fmt );
......
......@@ -248,7 +248,7 @@ static inline int filter_GetInputAttachments( filter_t *p_filter,
* Only the chroma properties of the dest format is used (chroma
* type, rgb masks and shifts)
*/
VLC_API filter_t * filter_NewBlend( vlc_object_t *, const video_format_t *p_dst_chroma ) LIBVLC_USED;
VLC_API filter_t * filter_NewBlend( vlc_object_t *, const video_format_t *p_dst_chroma ) VLC_USED;
/**
* It configures blend filter parameters that are allowed to changed
......@@ -307,7 +307,7 @@ typedef struct filter_chain_t filter_chain_t;
* \param p_buffer_allocation_data pointer to private allocation data
* \return pointer to a filter chain
*/
VLC_API filter_chain_t * filter_chain_New( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void * ) LIBVLC_USED;
VLC_API filter_chain_t * filter_chain_New( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void * ) VLC_USED;
#define filter_chain_New( a, b, c, d, e, f ) filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f )
/**
......
......@@ -31,12 +31,12 @@
#include <sys/types.h>
#include <dirent.h>
VLC_API int vlc_open( const char *filename, int flags, ... ) LIBVLC_USED;
VLC_API FILE * vlc_fopen( const char *filename, const char *mode ) LIBVLC_USED;
VLC_API int vlc_openat( int fd, const char *filename, int flags, ... ) LIBVLC_USED;
VLC_API int vlc_open( const char *filename, int flags, ... ) VLC_USED;
VLC_API FILE * vlc_fopen( const char *filename, const char *mode ) VLC_USED;
VLC_API int vlc_openat( int fd, const char *filename, int flags, ... ) VLC_USED;
VLC_API DIR * vlc_opendir( const char *dirname ) LIBVLC_USED;
VLC_API char * vlc_readdir( DIR *dir ) LIBVLC_USED;
VLC_API DIR * vlc_opendir( const char *dirname ) VLC_USED;
VLC_API char * vlc_readdir( DIR *dir ) VLC_USED;
VLC_API int vlc_loaddir( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) );
VLC_API int vlc_scandir( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) );
VLC_API int vlc_mkdir( const char *filename, mode_t mode );
......
......@@ -62,6 +62,6 @@ VLC_API int http_auth_ParseAuthenticationInfoHeader
VLC_API char *http_auth_FormatAuthorizationHeader
( vlc_object_t *, http_auth_t *,
const char *, const char *,
const char *, const char * ) LIBVLC_USED;
const char *, const char * ) VLC_USED;
#endif /* VLC_HTTP_H */
......@@ -99,15 +99,15 @@ struct httpd_message_t
};
/* create a new host */
VLC_API httpd_host_t * httpd_HostNew( vlc_object_t *, const char *psz_host, int i_port ) LIBVLC_USED;
VLC_API httpd_host_t * httpd_TLSHostNew( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) LIBVLC_USED;
VLC_API httpd_host_t * httpd_HostNew( vlc_object_t *, const char *psz_host, int i_port ) VLC_USED;
VLC_API httpd_host_t * httpd_TLSHostNew( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) VLC_USED;
/* delete a host */
VLC_API void httpd_HostDelete( httpd_host_t * );
/* register a new url */
VLC_API httpd_url_t * httpd_UrlNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED;
VLC_API httpd_url_t * httpd_UrlNewUnique( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED;
VLC_API httpd_url_t * httpd_UrlNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) VLC_USED;
VLC_API httpd_url_t * httpd_UrlNewUnique( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) VLC_USED;
/* register callback on a url */
VLC_API int httpd_UrlCatch( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * );
/* delete a url */
......@@ -121,26 +121,26 @@ VLC_API char* httpd_ServerIP( const httpd_client_t *cl, char *psz_ip );
/* High level */
VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) LIBVLC_USED;
VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) VLC_USED;
VLC_API httpd_file_sys_t * httpd_FileDelete( httpd_file_t * );
VLC_API httpd_handler_t * httpd_HandlerNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) LIBVLC_USED;