Commit 3f424a26 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Misc: remove leading underscores

parent 04180282
......@@ -265,8 +265,8 @@ 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_EXPORT( filter_chain_t *, __filter_chain_New, ( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void * ) );
#define filter_chain_New( a, b, c, d, e, f ) __filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f )
VLC_EXPORT( filter_chain_t *, filter_chain_New, ( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void * ) );
#define filter_chain_New( a, b, c, d, e, f ) filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f )
/**
* Delete filter chain will delete all filters in the chain and free all
......
......@@ -59,8 +59,8 @@ struct image_handler_t
filter_t *p_filter;
};
VLC_EXPORT( image_handler_t *, __image_HandlerCreate, ( vlc_object_t * ) );
#define image_HandlerCreate( a ) __image_HandlerCreate( VLC_OBJECT(a) )
VLC_EXPORT( image_handler_t *, image_HandlerCreate, ( vlc_object_t * ) );
#define image_HandlerCreate( a ) image_HandlerCreate( VLC_OBJECT(a) )
VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) );
#define image_Read( a, b, c, d ) a->pf_read( a, b, c, d )
......
......@@ -102,8 +102,8 @@ struct intf_dialog_args_t
VLC_EXPORT( int, intf_Create, ( vlc_object_t *, const char * ) );
#define intf_Create(a,b) intf_Create(VLC_OBJECT(a),b)
#define intf_Eject(a,b) __intf_Eject(VLC_OBJECT(a),b)
VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
VLC_EXPORT( int, intf_Eject, ( vlc_object_t *, const char * ) );
#define intf_Eject(a,b) intf_Eject(VLC_OBJECT(a),b)
VLC_EXPORT( void, libvlc_Quit, ( libvlc_int_t * ) );
......
......@@ -45,10 +45,10 @@ VLC_EXPORT( size_t, vlc_b64_decode_binary, ( uint8_t **pp_dst, const char *psz_s
VLC_EXPORT( char *, vlc_b64_decode, ( const char *psz_src ) );
VLC_EXPORT( char *, str_format_time, ( const char * ) );
#define str_format_meta( a, b ) __str_format_meta( VLC_OBJECT( a ), b )
VLC_EXPORT( char *, __str_format_meta, ( vlc_object_t *, const char * ) );
#define str_format( a, b ) __str_format( VLC_OBJECT( a ), b )
VLC_EXPORT( char *, __str_format, ( vlc_object_t *, const char * ) );
VLC_EXPORT( char *, str_format_meta, ( vlc_object_t *, const char * ) );
#define str_format_meta( a, b ) str_format_meta( VLC_OBJECT( a ), b )
VLC_EXPORT( char *, str_format, ( vlc_object_t *, const char * ) );
#define str_format( a, b ) str_format( VLC_OBJECT( a ), b )
VLC_EXPORT( char *, filename_sanitize, ( const char * ) ) LIBVLC_USED;
VLC_EXPORT( void, path_sanitize, ( char * ) );
......
......@@ -55,9 +55,8 @@ struct update_release_t
typedef struct update_release_t update_release_t;
#define update_New( a ) __update_New( VLC_OBJECT( a ) )
VLC_EXPORT( update_t *, __update_New, ( vlc_object_t * ) );
VLC_EXPORT( update_t *, update_New, ( vlc_object_t * ) );
#define update_New( a ) update_New( VLC_OBJECT( a ) )
VLC_EXPORT( void, update_Delete, ( update_t * ) );
VLC_EXPORT( void, update_Check, ( update_t *, void (*callback)( void*, bool ), void * ) );
VLC_EXPORT( bool, update_NeedUpgrade, ( update_t * ) );
......
......@@ -50,8 +50,8 @@ struct xml_t
const char * );
};
#define xml_Create( a ) __xml_Create( VLC_OBJECT(a) )
VLC_EXPORT( xml_t *, __xml_Create, ( vlc_object_t * ) );
VLC_EXPORT( xml_t *, xml_Create, ( vlc_object_t * ) );
#define xml_Create( a ) xml_Create( VLC_OBJECT(a) )
VLC_EXPORT( void, xml_Delete, ( xml_t * ) );
#define xml_ReaderCreate( a, b ) a->pf_reader_create( a, b )
......
......@@ -83,13 +83,7 @@
static int EjectSCSI ( int i_fd );
#endif
/*****************************************************************************
* intf_Eject: eject the CDRom
*****************************************************************************
* returns 0 on success
* returns 1 on failure
* returns -1 if not implemented
*****************************************************************************/
#undef intf_Eject
/**
* \brief Ejects the CD /DVD
* \ingroup vlc_interface
......@@ -97,7 +91,7 @@ static int EjectSCSI ( int i_fd );
* \param psz_device the CD/DVD to eject
* \return 0 on success, 1 on failure, -1 if not implemented
*/
int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
int intf_Eject( vlc_object_t *p_this, const char *psz_device )
{
VLC_UNUSED(p_this);
int i_ret = VLC_SUCCESS;
......
......@@ -130,7 +130,7 @@ filter_chain_DeleteFilter
filter_chain_GetFmtOut
filter_chain_GetLength
filter_chain_MouseFilter
__filter_chain_New
filter_chain_New
filter_chain_Reset
filter_chain_SubFilter
filter_chain_VideoFilter
......@@ -172,7 +172,7 @@ httpd_UrlDelete
httpd_UrlNew
httpd_UrlNewUnique
image_Ext2Fourcc
__image_HandlerCreate
image_HandlerCreate
image_HandlerDelete
image_Mime2Fourcc
image_Type2Fourcc
......@@ -222,7 +222,7 @@ input_Start
input_Stop
input_vaControl
intf_Create
__intf_Eject
intf_Eject
IsUTF8
libvlc_InternalAddIntf
libvlc_InternalCleanup
......@@ -405,8 +405,8 @@ stream_Read
stream_ReadLine
stream_UrlNew
stream_vaControl
__str_format
__str_format_meta
str_format
str_format_meta
str_format_time
subpicture_Delete
subpicture_New
......@@ -423,7 +423,7 @@ update_Delete
update_Download
update_GetRelease
update_NeedUpgrade
__update_New
update_New
us_asprintf
us_atof
us_strtod
......@@ -633,7 +633,7 @@ vout_SetDisplayAspect
vout_SetDisplayCrop
vout_display_GetDefaultDisplaySize
vout_display_PlacePicture
__xml_Create
xml_Create
text_style_Copy
text_style_Delete
text_style_Duplicate
......
......@@ -97,15 +97,16 @@ static int filter_chain_DeleteFilterInternal( filter_chain_t *, filter_t * );
static int UpdateBufferFunctions( filter_chain_t * );
#undef filter_chain_New
/**
* Filter chain initialisation
*/
filter_chain_t *__filter_chain_New( vlc_object_t *p_this,
const char *psz_capability,
bool b_allow_fmt_out_change,
int (*pf_buffer_allocation_init)( filter_t *, void * ),
void (*pf_buffer_allocation_clean)( filter_t * ),
void *p_buffer_allocation_data )
filter_chain_t *filter_chain_New( vlc_object_t *p_this,
const char *psz_capability,
bool b_allow_fmt_out_change,
int (*pf_buffer_allocation_init)( filter_t *, void * ),
void (*pf_buffer_allocation_clean)( filter_t * ),
void *p_buffer_allocation_data )
{
assert( p_this );
assert( psz_capability );
......
......@@ -74,11 +74,12 @@ vlc_fourcc_t image_Type2Fourcc( const char * );
vlc_fourcc_t image_Ext2Fourcc( const char * );
/*static const char *Fourcc2Ext( vlc_fourcc_t );*/
#undef image_HandlerCreate
/**
* Create an image_handler_t instance
*
*/
image_handler_t *__image_HandlerCreate( vlc_object_t *p_this )
image_handler_t *image_HandlerCreate( vlc_object_t *p_this )
{
image_handler_t *p_image = calloc( 1, sizeof(image_handler_t) );
if( !p_image )
......
......@@ -92,13 +92,14 @@
* Update_t functions
*****************************************************************************/
#undef update_New
/**
* Create a new update VLC struct
*
* \param p_this the calling vlc_object
* \return pointer to new update_t or NULL
*/
update_t *__update_New( vlc_object_t *p_this )
update_t *update_New( vlc_object_t *p_this )
{
update_t *p_update;
assert( p_this );
......@@ -750,7 +751,8 @@ update_release_t *update_GetRelease( update_t *p_update )
}
#else
update_t *__update_New( vlc_object_t *p_this )
#undef update_New
update_t *update_New( vlc_object_t *p_this )
{
(void)p_this;
return NULL;
......
......@@ -29,13 +29,14 @@
#include "vlc_xml.h"
#include "../libvlc.h"
#undef xml_Create
/*****************************************************************************
* xml_Create:
*****************************************************************************
* Create an instance of an XML parser.
* Returns NULL on error.
*****************************************************************************/
xml_t *__xml_Create( vlc_object_t *p_this )
xml_t *xml_Create( vlc_object_t *p_this )
{
xml_t *p_xml;
......
......@@ -625,7 +625,8 @@ char *str_format_time( const char *tformat )
memcpy( dst+d, string, len ); \
d += len; \
}
char *__str_format_meta( vlc_object_t *p_object, const char *string )
#undef str_format_meta
char *str_format_meta( vlc_object_t *p_object, const char *string )
{
const char *s = string;
bool b_is_format = false;
......@@ -947,10 +948,11 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
#undef INSERT_STRING
#undef INSERT_STRING_NO_FREE
#undef str_format
/**
* Apply str format time and str format meta
*/
char *__str_format( vlc_object_t *p_this, const char *psz_src )
char *str_format( vlc_object_t *p_this, const char *psz_src )
{
char *psz_buf1, *psz_buf2;
psz_buf1 = str_format_time( psz_src );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment