Remove some unneeded leading __ in functions names

diff --git a/modules/control/rc.c b/modules/control/rc.c
index c5e43dd0ddb8b10f37d07199735ed1ce6be60858..2a52093fb3c18ec7f5bb1ba5c6b8856d628e8fa9 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -136,10 +136,8 @@ struct intf_sys_t
 #endif
 };
 
-#define msg_rc( ... ) __msg_rc( p_intf, __VA_ARGS__ )
-
 VLC_FORMAT(2, 3)
-static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
+static void msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 {
     va_list args;
     char fmt_eol[strlen (psz_fmt) + 3];
@@ -153,6 +151,7 @@ static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
         net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, fmt_eol, args );
     va_end( args );
 }
+#define msg_rc( ... ) msg_rc( p_intf, __VA_ARGS__ )
 
 /*****************************************************************************
  * Module descriptor

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index ae33d26de0d3433bcb8d01f1b6536483139b09af..edce6855801e60cfe39c99ab581f652f1d3e1ce3 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -240,9 +240,7 @@ static const char *const ppsz_filter_options[] = {
  * parse the "--mosaic-offsets x1,y1,x2,y2,x3,y3" parameter
  * and set the corresponding struct filter_sys_t entries.
  *****************************************************************************/
-#define mosaic_ParseSetOffsets( a, b, c ) \
-      __mosaic_ParseSetOffsets( VLC_OBJECT( a ), b, c )
-static void __mosaic_ParseSetOffsets( vlc_object_t *p_this,
+static void mosaic_ParseSetOffsets( vlc_object_t *p_this,
                                       filter_sys_t *p_sys,
                                       char *psz_offsets )
 {
@@ -274,6 +272,8 @@ static void __mosaic_ParseSetOffsets( vlc_object_t *p_this,
         p_sys->i_offsets_length = i_index;
     }
 }
+#define mosaic_ParseSetOffsets( a, b, c ) \
+            mosaic_ParseSetOffsets( VLC_OBJECT( a ), b, c )
 
 /*****************************************************************************
  * CreateFiler: allocate mosaic video filter

diff --git a/modules/video_filter/mosaic.h b/modules/video_filter/mosaic.h
index edfc66388752899b19fa94ca76ec99956bab67e4..5e634fa10fbb64009866cc97050cb1f75bef85d0 100644 (file)
--- a/modules/video_filter/mosaic.h
+++ b/modules/video_filter/mosaic.h
@@ -41,8 +41,7 @@ typedef struct bridge_t
     int i_es_num;
 } bridge_t;
 
-#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
-static bridge_t *__GetBridge( vlc_object_t *p_object )
+static bridge_t *GetBridge( vlc_object_t *p_object )
 {
     vlc_object_t *p_libvlc = VLC_OBJECT( p_object->p_libvlc );
     vlc_value_t val;
@@ -56,4 +55,5 @@ static bridge_t *__GetBridge( vlc_object_t *p_object )
         return val.p_address;
     }
 }
+#define GetBridge(a) GetBridge( VLC_OBJECT(a) )