[vlc-commits] Remove some unneeded leading __ in functions names

[Rémi Duraffort]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Jul 12 08:24:04 2011 +0200| [7dc37abef1701bddf04058864ae5803df95e46b2] | committer: Rémi Duraffort

Remove some unneeded leading __ in functions names

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7dc37abef1701bddf04058864ae5803df95e46b2
---

 modules/control/rc.c          |    5 ++---
 modules/video_filter/mosaic.c |    6 +++---
 modules/video_filter/mosaic.h |    4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index c5e43dd..2a52093 100644
--- 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 ae33d26..edce685 100644
--- 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 edfc663..5e634fa 100644
--- 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) )