modules: remove leading underscores

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 5c250bf12a95776cfc3a65b2ce26cf5f2fae170f..2a1fdd52785c4e4578af0a31e1c2aae789b06425 100644 (file)
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -30,10 +30,10 @@
  * Exported functions.
  *****************************************************************************/
 
-#define module_need(a,b,c,d) __module_need(VLC_OBJECT(a),b,c,d)
-VLC_EXPORT( module_t *, __module_need, ( vlc_object_t *, const char *, const char *, bool ) );
-#define module_unneed(a,b) __module_unneed(VLC_OBJECT(a),b)
-VLC_EXPORT( void, __module_unneed, ( vlc_object_t *, module_t * ) );
+VLC_EXPORT( module_t *, module_need, ( vlc_object_t *, const char *, const char *, bool ) );
+#define module_need(a,b,c,d) module_need(VLC_OBJECT(a),b,c,d)
+VLC_EXPORT( void, module_unneed, ( vlc_object_t *, module_t * ) );
+#define module_unneed(a,b) module_unneed(VLC_OBJECT(a),b)
 VLC_EXPORT( bool,  module_exists, (const char *) );
 VLC_EXPORT( module_t *, module_find, (const char *) );
 

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index bd3121e02faad1d3a3c35f5a34c6a26d0532b522..18cfd6f2e57e744aca4eb44b0461ba054045ae40 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -248,10 +248,10 @@ module_gettext
 module_hold
 module_list_free
 module_list_get
-__module_need
+module_need
 module_provides
 module_release
-__module_unneed
+module_unneed
 msg_DisableObjectPrinting
 msg_EnableObjectPrinting
 msg_Generic

diff --git a/src/modules/modules.c b/src/modules/modules.c
index b648861ec2812ec289b3382bbbf2754c7ccf0309..42cdbeabb112f45a198d4d697a4c28b991bac857 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -83,6 +83,7 @@ static void   DupModule        ( module_t * );
 static void   UndupModule      ( module_t * );
 #endif
 
+#undef module_InitBank
 /**
  * Init bank
  *
@@ -91,7 +92,7 @@ static void   UndupModule      ( module_t * );
  * \param p_this vlc object structure
  * \return nothing
  */
-void __module_InitBank( vlc_object_t *p_this )
+void module_InitBank( vlc_object_t *p_this )
 {
     module_bank_t *p_bank = NULL;
 
@@ -387,6 +388,7 @@ static int modulecmp (const void *a, const void *b)
     return lb->i_score - la->i_score;
 }
 
+#undef module_need
 /**
  * module Need
  *
@@ -399,8 +401,8 @@ static int modulecmp (const void *a, const void *b)
  *                 but the same capability
  * \return the module or NULL in case of a failure
  */
-module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
-                          const char *psz_name, bool b_strict )
+module_t * module_need( vlc_object_t *p_this, const char *psz_capability,
+                        const char *psz_name, bool b_strict )
 {
     stats_TimerStart( p_this, "module_need()", STATS_TIMER_MODULE_NEED );
 
@@ -624,6 +626,7 @@ found_shortcut:
     return p_module;
 }
 
+#undef module_unneed
 /**
  * Module unneed
  *
@@ -633,7 +636,7 @@ found_shortcut:
  * \param p_module the module structure
  * \return nothing
  */
-void __module_unneed( vlc_object_t * p_this, module_t * p_module )
+void module_unneed( vlc_object_t * p_this, module_t * p_module )
 {
     /* Use the close method */
     if( p_module->pf_deactivate )

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 9aa911f6988d6c98c5c4b07ffe81bcdf109e79ed..2973c43aa4da35cae6a8ffbba77f4e15ca980acb 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -25,8 +25,8 @@
 # error This header file can only be included from LibVLC.
 #endif
 
-#ifndef __LIBVLC_MODULES_H
-# define __LIBVLC_MODULES_H 1
+#ifndef LIBVLC_MODULES_H
+# define LIBVLC_MODULES_H 1
 
 
 /* Number of tries before we unload an unused module */
@@ -142,8 +142,8 @@ struct module_t
 module_t *vlc_module_create (vlc_object_t *);
 module_t *vlc_submodule_create (module_t *module);
 
-#define module_InitBank(a)     __module_InitBank(VLC_OBJECT(a))
-void  __module_InitBank        ( vlc_object_t * );
+void  module_InitBank( vlc_object_t * );
+#define module_InitBank(a) module_InitBank(VLC_OBJECT(a))
 void module_LoadPlugins( vlc_object_t * );
 #define module_LoadPlugins(a) module_LoadPlugins(VLC_OBJECT(a))
 void module_EndBank( vlc_object_t *, bool );
@@ -163,4 +163,4 @@ void   CacheLoad  (vlc_object_t *, module_bank_t *, const char *);
 void   CacheSave  (vlc_object_t *, const char *, module_cache_t *const *, size_t);
 module_cache_t * CacheFind (module_bank_t *, const char *, int64_t, int64_t);
 
-#endif /* !__LIBVLC_MODULES_H */
+#endif /* !LIBVLC_MODULES_H */