Misc: remove leading underscores

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index c03c1e5c76e108f08258b12a4ad646c6bc685087..cdc69237498f64d36d9050f46136563cba893a33 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -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

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 352ec978cb1f827e3d78d7c9cbdfd960b4c62153..06d484d9e05156f2ffbe1e072f828038ca9526f3 100644 (file)
--- a/include/vlc_image.h
+++ b/include/vlc_image.h
@@ -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 )

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 4e774a7bfa1101fb18b1588a1e56a6dd14352eb3..9fc5fc0eb52a086d523239ad3f8c4e3ee6f1956f 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -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 * ) );
 

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index c04801b9e3604f0844abb7db5fffb1a0026c923d..66b43a21c004de27bcaadf900cfc67e074c6c036 100644 (file)
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -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 * ) );

diff --git a/include/vlc_update.h b/include/vlc_update.h
index 7365d65d3a6c911738e9a207715ee72b6c463034..1fd5a8593aca6d0f06b34debf5564c207abd8727 100644 (file)
--- a/include/vlc_update.h
+++ b/include/vlc_update.h
@@ -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 * ) );

diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index 20b097059adb5334912b2591fca3460161e75a58..497fc7f9334d62a7f4f19983f6ca362a3665fa8e 100644 (file)
--- a/include/vlc_xml.h
+++ b/include/vlc_xml.h
@@ -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 )

diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c
index 17946e41c5b1c9fefaf1d0f772519ad25cb50959..4031d99d75e5116501973499be4e00426257ceb4 100644 (file)
--- a/src/interface/intf_eject.c
+++ b/src/interface/intf_eject.c
@@ -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;

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 9430c1851a9952e9a5c15773e0b9e95ca78e7085..87800c3ea55e439159682b1017d9c24556850819 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -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

diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index 823d24dc53cc1bd0d36d5fbe27de507ba7b02e0e..01e99138409e0199bb48c3dcf4329a5c69e9063a 100644 (file)
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -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 );

diff --git a/src/misc/image.c b/src/misc/image.c
index 497d073a183a763264f508301ceec93f668638c9..e6e3109c9b95d8518a5c9a29978e4f18cf8d2499 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -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 )

diff --git a/src/misc/update.c b/src/misc/update.c
index 16c5ec660f32ee953e5abe04b1a68c4d83231b1a..5c55e17fab82d036b94de338a451494479bc32ee 100644 (file)
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -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;

diff --git a/src/misc/xml.c b/src/misc/xml.c
index 25515b500b20d430368975be99363d821f3c7b43..0d2625f8b3c6ece215b7ff0c3db0d4be1fbfbeef 100644 (file)
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -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;
 

diff --git a/src/text/strings.c b/src/text/strings.c
index a37fe165ead0f408ac1f694240d81a0f4fdc7c45..c09056403b88046e725fa26c8f0aaebc8d6b156f 100644 (file)
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -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 );