Skip to content

Commit

Permalink
Tag some APIs as LIBVLC_USED
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémi Denis-Courmont committed Sep 6, 2008
1 parent 050580d commit cf270dd
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 62 deletions.
4 changes: 2 additions & 2 deletions include/vlc_acl.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#define ACL_Duplicate(a,b) __ACL_Duplicate(VLC_OBJECT(a),b)

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 ) );
VLC_EXPORT( vlc_acl_t *, __ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) );
VLC_EXPORT( vlc_acl_t *, __ACL_Create, ( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED );
VLC_EXPORT( vlc_acl_t *, __ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED );
VLC_EXPORT( void, ACL_Destroy, ( vlc_acl_t *p_acl ) );

#define ACL_AddHost(a,b,c) ACL_AddNet(a,b,-1,c)
Expand Down
14 changes: 7 additions & 7 deletions include/vlc_aout.h
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,10 @@ static const uint32_t pi_vlc_chan_order_wg4[] =
VLC_EXPORT( void, aout_DateInit, ( audio_date_t *, uint32_t ) );
VLC_EXPORT( void, aout_DateSet, ( audio_date_t *, mtime_t ) );
VLC_EXPORT( void, aout_DateMove, ( audio_date_t *, mtime_t ) );
VLC_EXPORT( mtime_t, aout_DateGet, ( const audio_date_t * ) );
VLC_EXPORT( mtime_t, aout_DateGet, ( const audio_date_t * ) LIBVLC_USED);
VLC_EXPORT( mtime_t, aout_DateIncrement, ( audio_date_t *, uint32_t ) );

VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, bool ) );
VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, bool ) LIBVLC_USED );

/**
* This function computes the reordering needed to go from pi_chan_order_in to
Expand All @@ -389,14 +389,14 @@ VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t
VLC_EXPORT( int, aout_CheckChannelReorder, ( const uint32_t *pi_chan_order_in, const uint32_t *pi_chan_order_out, uint32_t i_channel_mask, int i_channels, int *pi_chan_table ) );
VLC_EXPORT( void, aout_ChannelReorder, ( uint8_t *, int, int, const int *, int ) );

VLC_EXPORT( unsigned int, aout_FormatNbChannels, ( const audio_sample_format_t * p_format ) );
VLC_EXPORT( unsigned int, aout_BitsPerSample, ( vlc_fourcc_t i_format ) );
VLC_EXPORT( unsigned int, aout_FormatNbChannels, ( const audio_sample_format_t * p_format ) LIBVLC_USED );
VLC_EXPORT( unsigned int, aout_BitsPerSample, ( vlc_fourcc_t i_format ) LIBVLC_USED );
VLC_EXPORT( void, aout_FormatPrepare, ( audio_sample_format_t * p_format ) );
VLC_EXPORT( void, aout_FormatPrint, ( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format ) );
VLC_EXPORT( const char *, aout_FormatPrintChannels, ( const audio_sample_format_t * ) );
VLC_EXPORT( const char *, aout_FormatPrintChannels, ( const audio_sample_format_t * ) LIBVLC_USED );

VLC_EXPORT( mtime_t, aout_FifoFirstDate, ( aout_instance_t *, aout_fifo_t * ) );
VLC_EXPORT( aout_buffer_t *, aout_FifoPop, ( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) );
VLC_EXPORT( mtime_t, aout_FifoFirstDate, ( aout_instance_t *, aout_fifo_t * ) LIBVLC_USED );
VLC_EXPORT( aout_buffer_t *, aout_FifoPop, ( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) LIBVLC_USED );

/* From intf.c : */
VLC_EXPORT( void, aout_VolumeSoftInit, ( aout_instance_t * ) );
Expand Down
17 changes: 9 additions & 8 deletions include/vlc_block.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,12 @@ struct block_t
* - block_Duplicate : create a copy of a block.
****************************************************************************/
VLC_EXPORT( void, block_Init, ( block_t *, void *, size_t ) );
VLC_EXPORT( block_t *, block_Alloc, ( size_t ) );
VLC_EXPORT( block_t *, block_Realloc, ( block_t *, ssize_t i_pre, size_t i_body ) );
VLC_EXPORT( block_t *, block_Alloc, ( size_t ) LIBVLC_USED );
VLC_EXPORT( block_t *, block_Realloc, ( block_t *, ssize_t i_pre, size_t i_body ) LIBVLC_USED );

#define block_New( dummy, size ) block_Alloc(size)

LIBVLC_USED
static inline block_t *block_Duplicate( block_t *p_block )
{
block_t *p_dup = block_Alloc( p_block->i_buffer );
Expand All @@ -152,8 +153,8 @@ static inline void block_Release( block_t *p_block )
p_block->pf_release( p_block );
}

VLC_EXPORT( block_t *, block_mmap_Alloc, (void *addr, size_t length) );
VLC_EXPORT( block_t *, block_File, (int fd) );
VLC_EXPORT( block_t *, block_mmap_Alloc, (void *addr, size_t length) LIBVLC_USED );
VLC_EXPORT( block_t *, block_File, (int fd) LIBVLC_USED );

static inline void block_Cleanup (void *block)
{
Expand Down Expand Up @@ -292,14 +293,14 @@ static inline block_t *block_ChainGather( block_t *p_list )
* block_FifoGet and block_FifoShow are cancellation points.
****************************************************************************/

VLC_EXPORT( block_fifo_t *, block_FifoNew, ( void ) );
VLC_EXPORT( block_fifo_t *, block_FifoNew, ( void ) LIBVLC_USED );
VLC_EXPORT( void, block_FifoRelease, ( block_fifo_t * ) );
VLC_EXPORT( void, block_FifoEmpty, ( block_fifo_t * ) );
VLC_EXPORT( size_t, block_FifoPut, ( block_fifo_t *, block_t * ) );
VLC_EXPORT( void, block_FifoWake, ( block_fifo_t * ) );
VLC_EXPORT( block_t *, block_FifoGet, ( block_fifo_t * ) );
VLC_EXPORT( block_t *, block_FifoGet, ( block_fifo_t * ) LIBVLC_USED );
VLC_EXPORT( block_t *, block_FifoShow, ( block_fifo_t * ) );
VLC_EXPORT( size_t, block_FifoSize, ( const block_fifo_t *p_fifo ) );
VLC_EXPORT( size_t, block_FifoCount, ( const block_fifo_t *p_fifo ) );
VLC_EXPORT( size_t, block_FifoSize, ( const block_fifo_t *p_fifo ) LIBVLC_USED );
VLC_EXPORT( size_t, block_FifoCount, ( const block_fifo_t *p_fifo ) LIBVLC_USED );

#endif /* VLC_BLOCK_H */
1 change: 1 addition & 0 deletions include/vlc_block_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ static inline void block_BytestreamPush( block_bytestream_t *p_bytestream,
if( !p_bytestream->p_block ) p_bytestream->p_block = p_block;
}

LIBVLC_USED
static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream )
{
block_t *p_block;
Expand Down
25 changes: 13 additions & 12 deletions include/vlc_charset.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
#include <dirent.h>

VLC_EXPORT( void, LocaleFree, ( const char * ) );
VLC_EXPORT( char *, FromLocale, ( const char * ) );
VLC_EXPORT( char *, FromLocaleDup, ( const char * ) );
VLC_EXPORT( char *, ToLocale, ( const char * ) );
VLC_EXPORT( char *, ToLocaleDup, ( const char * ) );
VLC_EXPORT( char *, FromLocale, ( const char * ) LIBVLC_USED );
VLC_EXPORT( char *, FromLocaleDup, ( const char * ) LIBVLC_USED );
VLC_EXPORT( char *, ToLocale, ( const char * ) LIBVLC_USED );
VLC_EXPORT( char *, ToLocaleDup, ( const char * ) LIBVLC_USED );

/* TODO: move all of this to "vlc_fs.h" or something like that */
VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, mode_t mode ) );
VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) );
VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) );
VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) );
VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, mode_t mode ) LIBVLC_USED );
VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) LIBVLC_USED );
VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) LIBVLC_USED );
VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) LIBVLC_USED );
VLC_EXPORT( int, utf8_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
VLC_EXPORT( int, utf8_mkdir, ( const char *filename, mode_t mode ) );
Expand All @@ -61,9 +61,10 @@ VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) );

VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
VLC_EXPORT( const char *, IsUTF8, ( const char * ) );
VLC_EXPORT( const char *, IsUTF8, ( const char * ) LIBVLC_USED );

#ifdef WIN32
LIBVLC_USED
static inline char *FromWide (const wchar_t *wide)
{
size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
Expand All @@ -78,9 +79,9 @@ static inline char *FromWide (const wchar_t *wide)
}
#endif

VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) LIBVLC_USED );

VLC_EXPORT( double, us_strtod, ( const char *, char ** ) );
VLC_EXPORT( double, us_atof, ( const char * ) );
VLC_EXPORT( double, us_strtod, ( const char *, char ** ) LIBVLC_USED );
VLC_EXPORT( double, us_atof, ( const char * ) LIBVLC_USED );

#endif
4 changes: 2 additions & 2 deletions include/vlc_codec.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ struct encoder_t
* @}
*/

VLC_EXPORT( input_attachment_t *, decoder_GetInputAttachment, ( decoder_t *, const char *psz_name ) );
VLC_EXPORT( input_attachment_t *, decoder_GetInputAttachment, ( decoder_t *, const char *psz_name ) LIBVLC_USED );
VLC_EXPORT( int, decoder_GetInputAttachments, ( decoder_t *p_dec, input_attachment_t ***ppp_attachment, int *pi_attachment ) );
VLC_EXPORT( mtime_t, decoder_GetDisplayDate, ( decoder_t *, mtime_t ) );
VLC_EXPORT( mtime_t, decoder_GetDisplayDate, ( decoder_t *, mtime_t ) LIBVLC_USED );

#endif /* _VLC_CODEC_H */
4 changes: 2 additions & 2 deletions include/vlc_codec_synchro.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
/*****************************************************************************
* Prototypes
*****************************************************************************/
VLC_EXPORT( decoder_synchro_t *, decoder_SynchroInit, ( decoder_t *, int ) );
VLC_EXPORT( decoder_synchro_t *, decoder_SynchroInit, ( decoder_t *, int ) LIBVLC_USED );
VLC_EXPORT( void, decoder_SynchroRelease, ( decoder_synchro_t * ) );
VLC_EXPORT( void, decoder_SynchroReset, ( decoder_synchro_t * ) );
VLC_EXPORT( bool, decoder_SynchroChoose, ( decoder_synchro_t *, int, int, bool ) );
VLC_EXPORT( void, decoder_SynchroTrash, ( decoder_synchro_t * ) );
VLC_EXPORT( void, decoder_SynchroDecode, ( decoder_synchro_t * ) );
VLC_EXPORT( void, decoder_SynchroEnd, ( decoder_synchro_t *, int, bool ) );
VLC_EXPORT( mtime_t, decoder_SynchroDate, ( decoder_synchro_t * ) );
VLC_EXPORT( mtime_t, decoder_SynchroDate, ( decoder_synchro_t * ) LIBVLC_USED );
VLC_EXPORT( void, decoder_SynchroNewPicture, ( decoder_synchro_t *, int, int, mtime_t, mtime_t, int, bool ) );

45 changes: 29 additions & 16 deletions include/vlc_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,8 @@ VLC_EXPORT(void, __vlc_gc_init, ( gc_object_t * p_gc,
# define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
#endif

static inline int64_t GCD( int64_t a, int64_t b )
LIBVLC_USED
static inline int64_t GCD ( int64_t a, int64_t b )
{
while( b )
{
Expand All @@ -610,6 +611,7 @@ static inline int64_t GCD( int64_t a, int64_t b )
}

/* function imported from libavutil/common.h */
LIBVLC_USED
static inline uint8_t clip_uint8_vlc( int32_t a )
{
if( a&(~255) ) return (-a)>>31;
Expand All @@ -636,23 +638,28 @@ static inline uint8_t clip_uint8_vlc( int32_t a )

#define EMPTY_STR(str) (!str || !*str)

VLC_EXPORT( char const *, vlc_error, ( int ) );
VLC_EXPORT( char const *, vlc_error, ( int ) LIBVLC_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
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
static inline uint32_t U32_AT( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
return ( ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16)
| ((uint32_t)p[2] << 8) | p[3] );
}

LIBVLC_USED
static inline uint64_t U64_AT( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
Expand All @@ -662,17 +669,22 @@ static inline uint64_t U64_AT( const void * _p )
| ((uint64_t)p[6] << 8) | p[7] );
}

LIBVLC_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
static inline uint32_t GetDWLE( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
return ( ((uint32_t)p[3] << 24) | ((uint32_t)p[2] << 16)
| ((uint32_t)p[1] << 8) | p[0] );
}

LIBVLC_USED
static inline uint64_t GetQWLE( const void * _p )
{
const uint8_t * p = (const uint8_t *)_p;
Expand Down Expand Up @@ -735,6 +747,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
#define ntoh16(i) ntohs(i)
#define ntoh32(i) ntohl(i)

LIBVLC_USED
static inline uint64_t ntoh64 (uint64_t ll)
{
union { uint64_t qw; uint8_t b[16]; } v = { ll };
Expand All @@ -754,9 +767,9 @@ static inline uint64_t ntoh64 (uint64_t ll)

/* Stuff defined in src/extras/libc.c */
VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) );
VLC_EXPORT( long long, vlc_strtoll, ( const char *nptr, char **endptr, int base ) );
VLC_EXPORT( long long, vlc_strtoll, ( const char *nptr, char **endptr, int base ) LIBVLC_USED );

VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) LIBVLC_USED );
char *vlc_strsep( char **, const char * );

#if defined(WIN32) || defined(UNDER_CE)
Expand Down Expand Up @@ -823,16 +836,16 @@ VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uin

/* vlc_wraptext (defined in src/extras/libc.c) */
#define wraptext vlc_wraptext
VLC_EXPORT( char *, vlc_wraptext, ( const char *, int ) );
VLC_EXPORT( char *, vlc_wraptext, ( const char *, int ) LIBVLC_USED );

/* iconv wrappers (defined in src/extras/libc.c) */
typedef void *vlc_iconv_t;
VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) );
VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) );
VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) LIBVLC_USED );
VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED );
VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );

/* execve wrapper (defined in src/extras/libc.c) */
VLC_EXPORT( 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_EXPORT( 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 );
#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)

/* dir wrappers (defined in src/extras/libc.c) */
Expand Down Expand Up @@ -864,18 +877,18 @@ VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
/*****************************************************************************
* I18n stuff
*****************************************************************************/
VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) );
VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) LIBVLC_USED );

/*****************************************************************************
* libvlc features
*****************************************************************************/
VLC_EXPORT( const char *, VLC_Version, ( void ) );
VLC_EXPORT( const char *, VLC_CompileBy, ( void ) );
VLC_EXPORT( const char *, VLC_CompileHost, ( void ) );
VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) );
VLC_EXPORT( const char *, VLC_Compiler, ( void ) );
VLC_EXPORT( const char *, VLC_Error, ( int ) );
VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_Error, ( int ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_Changeset, ( void ) LIBVLC_USED );

/*****************************************************************************
* Additional vlc stuff
Expand Down
2 changes: 2 additions & 0 deletions include/vlc_config_cat.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ static const struct config_category_t categories_array[] =
{ -1, NULL, NULL }
};

LIBVLC_USED
static inline const char *config_CategoryNameGet( int i_value )
{
int i = 0 ;
Expand All @@ -300,6 +301,7 @@ static inline const char *config_CategoryNameGet( int i_value )
return NULL;
}

LIBVLC_USED
static inline const char *config_CategoryHelpGet( int i_value )
{
int i = 0 ;
Expand Down
26 changes: 13 additions & 13 deletions include/vlc_configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,31 +200,31 @@ struct module_config_t
* Prototypes - these methods are used to get, set or manipulate configuration
* data.
*****************************************************************************/
VLC_EXPORT( int, __config_GetType, (vlc_object_t *, const char *) );
VLC_EXPORT( int, __config_GetInt, (vlc_object_t *, const char *) );
VLC_EXPORT( int, __config_GetType, (vlc_object_t *, const char *) LIBVLC_USED );
VLC_EXPORT( int, __config_GetInt, (vlc_object_t *, const char *) LIBVLC_USED );
VLC_EXPORT( void, __config_PutInt, (vlc_object_t *, const char *, int) );
VLC_EXPORT( float, __config_GetFloat, (vlc_object_t *, const char *) );
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 *) );
VLC_EXPORT( char *, __config_GetPsz, (vlc_object_t *, const char *) LIBVLC_USED );
VLC_EXPORT( void, __config_PutPsz, (vlc_object_t *, const char *, const char *) );

#define config_SaveConfigFile(a,b) __config_SaveConfigFile(VLC_OBJECT(a),b)
VLC_EXPORT( int, __config_SaveConfigFile, ( vlc_object_t *, const char * ) );
#define config_ResetAll(a) __config_ResetAll(VLC_OBJECT(a))
VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) );

VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) );
VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED );

VLC_EXPORT(const char *, config_GetDataDir, ( void ));
VLC_EXPORT(const char *, config_GetConfDir, ( void ) );
VLC_EXPORT(const char *, config_GetHomeDir, ( void ));
VLC_EXPORT(char *, config_GetUserConfDir, ( void ) );
VLC_EXPORT(char *, config_GetUserDataDir, ( void ) );
VLC_EXPORT(char *, config_GetCacheDir, ( void ) );
VLC_EXPORT(const char *, config_GetDataDir, ( void ) LIBVLC_USED);
VLC_EXPORT(const char *, config_GetConfDir, ( void ) LIBVLC_USED);
VLC_EXPORT(const char *, config_GetHomeDir, ( void ) LIBVLC_USED);
VLC_EXPORT(char *, config_GetUserConfDir, ( void ) LIBVLC_USED);
VLC_EXPORT(char *, config_GetUserDataDir, ( void ) LIBVLC_USED);
VLC_EXPORT(char *, config_GetCacheDir, ( void ) LIBVLC_USED);

VLC_EXPORT( void, __config_AddIntf, ( vlc_object_t *, const char * ) );
VLC_EXPORT( void, __config_RemoveIntf, ( vlc_object_t *, const char * ) );
VLC_EXPORT( bool, __config_ExistIntf, ( vlc_object_t *, const char * ) );
VLC_EXPORT( bool, __config_ExistIntf, ( vlc_object_t *, const char * ) LIBVLC_USED);

#define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b)
#define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b)
Expand Down Expand Up @@ -298,7 +298,7 @@ VLC_EXPORT( char *, config_StringUnescape, ( char *psz_string ) );
*
* The escaped characters are ' " and \
*/
VLC_EXPORT( char *, config_StringEscape, ( const char *psz_string ) );
VLC_EXPORT( char *, config_StringEscape, ( const char *psz_string ) LIBVLC_USED);

# ifdef __cplusplus
}
Expand Down
2 changes: 2 additions & 0 deletions include/vlc_demux.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int
* Miscellaneous helpers for demuxers
*************************************************************************/

LIBVLC_USED
static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension )
{
const char *psz_ext = strrchr ( p_demux->psz_path, '.' );
Expand All @@ -165,6 +166,7 @@ static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_exte
return true;
}

LIBVLC_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 ) )
Expand Down
Loading

0 comments on commit cf270dd

Please sign in to comment.