Remove E_()

include/vlc_modules_macros.h

@@ -62,10 +62,8 @@
 /* If the module is built-in, then we need to define foo_InitModule instead
  * of InitModule. Same for Activate- and DeactivateModule. */
 #ifdef __PLUGIN__
-#   define E_( function )          CONCATENATE( function, MODULE_SYMBOL )
 #   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL )
 #else
-#   define E_( function )          CONCATENATE( function, MODULE_NAME )
 #   define __VLC_SYMBOL( symbol )  CONCATENATE( symbol, MODULE_NAME )
 #endif
 
@@ -96,7 +94,7 @@
  */
 #if defined (__PLUGIN__) || defined (__BUILTIN__)
 EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL
-E_(vlc_entry) ( module_t *p_module );
+__VLC_SYMBOL(vlc_entry) ( module_t *p_module );
 #endif
 
 #define vlc_module_begin( )                                                   \

modules/access/dvb/access.c

@@ -336,7 +336,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Getting frontend info */
-    if( E_(FrontendOpen)( p_access) )
+    if( FrontendOpen( p_access) )
     {
         free( p_sys );
         return VLC_EGENERIC;
@@ -344,17 +344,17 @@ static int Open( vlc_object_t *p_this )
 
     /* Setting frontend parameters for tuning the hardware */
     msg_Dbg( p_access, "trying to tune the frontend...");
-    if( E_(FrontendSet)( p_access ) < 0 )
+    if( FrontendSet( p_access ) < 0 )
     {
-        E_(FrontendClose)( p_access );
+        FrontendClose( p_access );
         free( p_sys );
         return VLC_EGENERIC;
     }
 
     /* Opening DVR device */
-    if( E_(DVROpen)( p_access ) < 0 )
+    if( DVROpen( p_access ) < 0 )
     {
-        E_(FrontendClose)( p_access );
+        FrontendClose( p_access );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -371,7 +371,7 @@ static int Open( vlc_object_t *p_this )
         FilterSet( p_access, 0x0, OTHER_TYPE );
     }
 
-    E_(CAMOpen)( p_access );
+    CAMOpen( p_access );
 
     if( p_sys->b_budget_mode )
         p_sys->i_read_once = DVB_READ_ONCE;
@@ -379,7 +379,7 @@ static int Open( vlc_object_t *p_this )
         p_sys->i_read_once = DVB_READ_ONCE_START;
 
 #ifdef ENABLE_HTTPD
-    E_(HTTPOpen)( p_access );
+    HTTPOpen( p_access );
 #endif
 
     return VLC_SUCCESS;
@@ -395,12 +395,12 @@ static void Close( vlc_object_t *p_this )
 
     FilterUnset( p_access, p_sys->b_budget_mode ? 1 : MAX_DEMUX );
 
-    E_(DVRClose)( p_access );
-    E_(FrontendClose)( p_access );
-    E_(CAMClose)( p_access );
+    DVRClose( p_access );
+    FrontendClose( p_access );
+    CAMClose( p_access );
 
 #ifdef ENABLE_HTTPD
-    E_(HTTPClose)( p_access );
+    HTTPClose( p_access );
 #endif
 
     free( p_sys );
@@ -444,13 +444,13 @@ static block_t *Block( access_t *p_access )
 
         if ( p_sys->i_ca_handle && mdate() > p_sys->i_ca_next_event )
         {
-            E_(CAMPoll)( p_access );
+            CAMPoll( p_access );
             p_sys->i_ca_next_event = mdate() + p_sys->i_ca_timeout;
         }
 
         if ( ufds[1].revents )
         {
-            E_(FrontendPoll)( p_access );
+            FrontendPoll( p_access );
         }
 
 #ifdef ENABLE_HTTPD
@@ -475,19 +475,19 @@ static block_t *Block( access_t *p_access )
 
         if ( p_sys->b_request_frontend_info )
         {
-            E_(FrontendStatus)( p_access );
+            FrontendStatus( p_access );
         }
 
         if ( p_sys->b_request_mmi_info )
         {
-            E_(CAMStatus)( p_access );
+            CAMStatus( p_access );
         }
 #endif
 
         if ( p_sys->i_frontend_timeout && mdate() > p_sys->i_frontend_timeout )
         {
             msg_Warn( p_access, "no lock, tuning again" );
-            E_(FrontendSet)( p_access );
+            FrontendSet( p_access );
         }
 
         if ( ufds[0].revents )
@@ -569,7 +569,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
             p_pmt = (dvbpsi_pmt_t *)va_arg( args, dvbpsi_pmt_t * );
 
-            E_(CAMSet)( p_access, p_pmt );
+            CAMSet( p_access, p_pmt );
             break;
         }
 
@@ -605,7 +605,7 @@ static void FilterSet( access_t *p_access, int i_pid, int i_type )
         return;
     }
 
-    if( E_(DMXSetFilter)( p_access, i_pid,
+    if( DMXSetFilter( p_access, i_pid,
                            &p_sys->p_demux_handles[i].i_handle, i_type ) )
     {
         msg_Err( p_access, "DMXSetFilter failed" );
@@ -627,7 +627,7 @@ static void FilterUnset( access_t *p_access, int i_max )
     {
         if( p_sys->p_demux_handles[i].i_type )
         {
-            E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle );
+            DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle );
             p_sys->p_demux_handles[i].i_type = 0;
         }
     }
@@ -643,7 +643,7 @@ static void FilterUnsetPID( access_t *p_access, int i_pid )
         if( p_sys->p_demux_handles[i].i_type &&
             p_sys->p_demux_handles[i].i_pid == i_pid )
         {
-            E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle );
+            DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle );
             p_sys->p_demux_handles[i].i_type = 0;
         }
     }

modules/access/dvb/dvb.h

@@ -181,42 +181,42 @@ struct access_sys_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-int  E_(FrontendOpen)( access_t * );
-void E_(FrontendPoll)( access_t *p_access );
-int  E_(FrontendSet)( access_t * );
-void E_(FrontendClose)( access_t * );
+int  FrontendOpen( access_t * );
+void FrontendPoll( access_t *p_access );
+int  FrontendSet( access_t * );
+void FrontendClose( access_t * );
 #ifdef ENABLE_HTTPD
-void E_(FrontendStatus)( access_t * );
+void FrontendStatus( access_t * );
 #endif
 
-int E_(DMXSetFilter)( access_t *, int i_pid, int * pi_fd, int i_type );
-int E_(DMXUnsetFilter)( access_t *, int i_fd );
+int DMXSetFilter( access_t *, int i_pid, int * pi_fd, int i_type );
+int DMXUnsetFilter( access_t *, int i_fd );
 
-int  E_(DVROpen)( access_t * );
-void E_(DVRClose)( access_t * );
+int  DVROpen( access_t * );
+void DVRClose( access_t * );
 
-int  E_(CAMOpen)( access_t * );
-int  E_(CAMPoll)( access_t * );
-int  E_(CAMSet)( access_t *, dvbpsi_pmt_t * );
-void E_(CAMClose)( access_t * );
+int  CAMOpen( access_t * );
+int  CAMPoll( access_t * );
+int  CAMSet( access_t *, dvbpsi_pmt_t * );
+void CAMClose( access_t * );
 #ifdef ENABLE_HTTPD
-void E_(CAMStatus)( access_t * );
+void CAMStatus( access_t * );
 #endif
 
-int E_(en50221_Init)( access_t * );
-int E_(en50221_Poll)( access_t * );
-int E_(en50221_SetCAPMT)( access_t *, dvbpsi_pmt_t * );
-int E_(en50221_OpenMMI)( access_t * p_access, int i_slot );
-int E_(en50221_CloseMMI)( access_t * p_access, int i_slot );
-en50221_mmi_object_t *E_(en50221_GetMMIObject)( access_t * p_access,
+int en50221_Init( access_t * );
+int en50221_Poll( access_t * );
+int en50221_SetCAPMT( access_t *, dvbpsi_pmt_t * );
+int en50221_OpenMMI( access_t * p_access, int i_slot );
+int en50221_CloseMMI( access_t * p_access, int i_slot );
+en50221_mmi_object_t *en50221_GetMMIObject( access_t * p_access,
                                                 int i_slot );
-void E_(en50221_SendMMIObject)( access_t * p_access, int i_slot,
+void en50221_SendMMIObject( access_t * p_access, int i_slot,
                                 en50221_mmi_object_t *p_object );
-void E_(en50221_End)( access_t * );
+void en50221_End( access_t * );
 
 #ifdef ENABLE_HTTPD
-int E_(HTTPOpen)( access_t *p_access );
-void E_(HTTPClose)( access_t *p_access );
-char *E_(HTTPExtractValue)( char *psz_uri, const char *psz_name,
+int HTTPOpen( access_t *p_access );
+void HTTPClose( access_t *p_access );
+char *HTTPExtractValue( char *psz_uri, const char *psz_name,
                             char *psz_value, int i_value_max );
 #endif

modules/access/dvb/en50221.c

@@ -1844,7 +1844,7 @@ static int InitSlot( access_t * p_access, int i_slot )
 /*****************************************************************************
  * en50221_Init : Initialize the CAM for en50221
  *****************************************************************************/
-int E_(en50221_Init)( access_t * p_access )
+int en50221_Init( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -1941,7 +1941,7 @@ int E_(en50221_Init)( access_t * p_access )
 /*****************************************************************************
  * en50221_Poll : Poll the CAM for TPDUs
  *****************************************************************************/
-int E_(en50221_Poll)( access_t * p_access )
+int en50221_Poll( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int i_slot;
@@ -2088,7 +2088,7 @@ int E_(en50221_Poll)( access_t * p_access )
 /*****************************************************************************
  * en50221_SetCAPMT :
  *****************************************************************************/
-int E_(en50221_SetCAPMT)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
+int en50221_SetCAPMT( access_t * p_access, dvbpsi_pmt_t *p_pmt )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int i, i_session_id;
@@ -2159,7 +2159,7 @@ int E_(en50221_SetCAPMT)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
 /*****************************************************************************
  * en50221_OpenMMI :
  *****************************************************************************/
-int E_(en50221_OpenMMI)( access_t * p_access, int i_slot )
+int en50221_OpenMMI( access_t * p_access, int i_slot )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -2202,7 +2202,7 @@ int E_(en50221_OpenMMI)( access_t * p_access, int i_slot )
 /*****************************************************************************
  * en50221_CloseMMI :
  *****************************************************************************/
-int E_(en50221_CloseMMI)( access_t * p_access, int i_slot )
+int en50221_CloseMMI( access_t * p_access, int i_slot )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -2233,7 +2233,7 @@ int E_(en50221_CloseMMI)( access_t * p_access, int i_slot )
 /*****************************************************************************
  * en50221_GetMMIObject :
  *****************************************************************************/
-en50221_mmi_object_t *E_(en50221_GetMMIObject)( access_t * p_access,
+en50221_mmi_object_t *en50221_GetMMIObject( access_t * p_access,
                                                 int i_slot )
 {
     access_sys_t *p_sys = p_access->p_sys;
@@ -2262,7 +2262,7 @@ en50221_mmi_object_t *E_(en50221_GetMMIObject)( access_t * p_access,
 /*****************************************************************************
  * en50221_SendMMIObject :
  *****************************************************************************/
-void E_(en50221_SendMMIObject)( access_t * p_access, int i_slot,
+void en50221_SendMMIObject( access_t * p_access, int i_slot,
                                 en50221_mmi_object_t *p_object )
 {
     access_sys_t *p_sys = p_access->p_sys;
@@ -2284,7 +2284,7 @@ void E_(en50221_SendMMIObject)( access_t * p_access, int i_slot,
 /*****************************************************************************
  * en50221_End :
  *****************************************************************************/
-void E_(en50221_End)( access_t * p_access )
+void en50221_End( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int i_session_id, i;

modules/access/dvb/http.c

@@ -79,7 +79,7 @@ static int HttpCallback( httpd_file_sys_t *p_args,
 /*****************************************************************************
  * HTTPOpen: Start the internal HTTP server
  *****************************************************************************/
-int E_(HTTPOpen)( access_t *p_access )
+int HTTPOpen( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     char          *psz_address, *psz_cert = NULL, *psz_key = NULL,
@@ -194,7 +194,7 @@ int E_(HTTPOpen)( access_t *p_access )
 /*****************************************************************************
  * HTTPClose: Stop the internal HTTP server
  *****************************************************************************/
-void E_(HTTPClose)( access_t *p_access )
+void HTTPClose( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -295,7 +295,7 @@ static int HttpCallback( httpd_file_sys_t *p_args,
 /****************************************************************************
  * HTTPExtractValue: Extract a GET variable from psz_request
  ****************************************************************************/
-char *E_(HTTPExtractValue)( char *psz_uri, const char *psz_name,
+char *HTTPExtractValue( char *psz_uri, const char *psz_name,
                             char *psz_value, int i_value_max )
 {
     char *p = psz_uri;

modules/access/dvb/linux_dvb.c

@@ -91,7 +91,7 @@ static int FrontendSetATSC( access_t * );
 /*****************************************************************************
  * FrontendOpen : Determine frontend device information and capabilities
  *****************************************************************************/
-int E_(FrontendOpen)( access_t *p_access )
+int FrontendOpen( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     frontend_t * p_frontend;
@@ -212,7 +212,7 @@ int E_(FrontendOpen)( access_t *p_access )
 /*****************************************************************************
  * FrontendClose : Close the frontend
  *****************************************************************************/
-void E_(FrontendClose)( access_t *p_access )
+void FrontendClose( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -228,7 +228,7 @@ void E_(FrontendClose)( access_t *p_access )
 /*****************************************************************************
  * FrontendSet : Tune !
  *****************************************************************************/
-int E_(FrontendSet)( access_t *p_access )
+int FrontendSet( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -283,7 +283,7 @@ int E_(FrontendSet)( access_t *p_access )
 /*****************************************************************************
  * FrontendPoll : Poll for frontend events
  *****************************************************************************/
-void E_(FrontendPoll)( access_t *p_access )
+void FrontendPoll( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     frontend_t * p_frontend = p_sys->p_frontend;
@@ -359,7 +359,7 @@ void E_(FrontendPoll)( access_t *p_access )
             {
                 /* The frontend was reinited. */
                 msg_Warn( p_access, "reiniting frontend");
-                E_(FrontendSet)( p_access );
+                FrontendSet( p_access );
             }
         }
 #undef IF_UP
@@ -370,7 +370,7 @@ void E_(FrontendPoll)( access_t *p_access )
 /*****************************************************************************
  * FrontendStatus : Read frontend status
  *****************************************************************************/
-void E_(FrontendStatus)( access_t *p_access )
+void FrontendStatus( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     frontend_t *p_frontend = p_sys->p_frontend;
@@ -1223,7 +1223,7 @@ static int FrontendSetATSC( access_t *p_access )
 /*****************************************************************************
  * DMXSetFilter : controls the demux to add a filter
  *****************************************************************************/
-int E_(DMXSetFilter)( access_t * p_access, int i_pid, int * pi_fd, int i_type )
+int DMXSetFilter( access_t * p_access, int i_pid, int * pi_fd, int i_type )
 {
     struct dmx_pes_filter_params s_filter_params;
     int i_ret;
@@ -1361,7 +1361,7 @@ int E_(DMXSetFilter)( access_t * p_access, int i_pid, int * pi_fd, int i_type )
 /*****************************************************************************
  * DMXUnsetFilter : removes a filter
  *****************************************************************************/
-int E_(DMXUnsetFilter)( access_t * p_access, int i_fd )
+int DMXUnsetFilter( access_t * p_access, int i_fd )
 {
     int i_ret;
 
@@ -1384,7 +1384,7 @@ int E_(DMXUnsetFilter)( access_t * p_access, int i_fd )
 /*****************************************************************************
  * DVROpen :
  *****************************************************************************/
-int E_(DVROpen)( access_t * p_access )
+int DVROpen( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     unsigned int i_adapter, i_device;
@@ -1421,7 +1421,7 @@ int E_(DVROpen)( access_t * p_access )
 /*****************************************************************************
  * DVRClose :
  *****************************************************************************/
-void E_(DVRClose)( access_t * p_access )
+void DVRClose( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -1436,7 +1436,7 @@ void E_(DVRClose)( access_t * p_access )
 /*****************************************************************************
  * CAMOpen :
  *****************************************************************************/
-int E_(CAMOpen)( access_t *p_access )
+int CAMOpen( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     char ca[128];
@@ -1522,13 +1522,13 @@ int E_(CAMOpen)( access_t *p_access )
     memset( p_sys->pb_slot_mmi_undisplayed, 0,
             sizeof(bool) * MAX_CI_SLOTS );
 
-    return E_(en50221_Init)( p_access );
+    return en50221_Init( p_access );
 }
 
 /*****************************************************************************
  * CAMPoll :
  *****************************************************************************/
-int E_(CAMPoll)( access_t * p_access )
+int CAMPoll( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int i_ret = VLC_EGENERIC;
@@ -1541,7 +1541,7 @@ int E_(CAMPoll)( access_t * p_access )
     switch( p_sys->i_ca_type )
     {
     case CA_CI_LINK:
-        i_ret = E_(en50221_Poll)( p_access );
+        i_ret = en50221_Poll( p_access );
         break;
     case CA_CI:
         i_ret = VLC_SUCCESS;
@@ -1558,7 +1558,7 @@ int E_(CAMPoll)( access_t * p_access )
 /*****************************************************************************
  * CAMStatus :
  *****************************************************************************/
-void E_(CAMStatus)( access_t * p_access )
+void CAMStatus( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     char *p;
@@ -1592,7 +1592,7 @@ void E_(CAMStatus)( access_t * p_access )
 
         p_sys->psz_request = NULL;
 
-        if ( E_(HTTPExtractValue)( psz_request, "slot", psz_value,
+        if ( HTTPExtractValue( psz_request, "slot", psz_value,
                                    sizeof(psz_value) ) == NULL )
         {
             p_sys->psz_mmi_info = strdup( "invalid request parameter\n" );
@@ -1600,27 +1600,27 @@ void E_(CAMStatus)( access_t * p_access )
         }
         i_slot = atoi(psz_value);
 
-        if ( E_(HTTPExtractValue)( psz_request, "open", psz_value,
+        if ( HTTPExtractValue( psz_request, "open", psz_value,
                                    sizeof(psz_value) ) != NULL )
         {
-            E_(en50221_OpenMMI)( p_access, i_slot );
+            en50221_OpenMMI( p_access, i_slot );
             return;
         }
 
-        if ( E_(HTTPExtractValue)( psz_request, "close", psz_value,
+        if ( HTTPExtractValue( psz_request, "close", psz_value,
                                    sizeof(psz_value) ) != NULL )
         {
-            E_(en50221_CloseMMI)( p_access, i_slot );
+            en50221_CloseMMI( p_access, i_slot );
             return;
         }
 
-        if ( E_(HTTPExtractValue)( psz_request, "cancel", psz_value,
+        if ( HTTPExtractValue( psz_request, "cancel", psz_value,
                                    sizeof(psz_value) ) == NULL )
         {
             b_ok = true;
         }
 
-        if ( E_(HTTPExtractValue)( psz_request, "type", psz_value,
+        if ( HTTPExtractValue( psz_request, "type", psz_value,
                                    sizeof(psz_value) ) == NULL )
         {
             p_sys->psz_mmi_info = strdup( "invalid request parameter\n" );
@@ -1637,7 +1637,7 @@ void E_(CAMStatus)( access_t * p_access )
             }
             else
             {
-                if ( E_(HTTPExtractValue)( psz_request, "answ", psz_value,
+                if ( HTTPExtractValue( psz_request, "answ", psz_value,
                                            sizeof(psz_value) ) == NULL )
                 {
                     p_sys->psz_mmi_info = strdup( "invalid request parameter\n" );
@@ -1656,7 +1656,7 @@ void E_(CAMStatus)( access_t * p_access )
             }
             else
             {
-                if ( E_(HTTPExtractValue)( psz_request, "choice", psz_value,
+                if ( HTTPExtractValue( psz_request, "choice", psz_value,
                                            sizeof(psz_value) ) == NULL )
                     mmi_object.u.menu_answ.i_choice = 0;
                 else
@@ -1664,7 +1664,7 @@ void E_(CAMStatus)( access_t * p_access )
             }
         }
 
-        E_(en50221_SendMMIObject)( p_access, i_slot, &mmi_object );
+        en50221_SendMMIObject( p_access, i_slot, &mmi_object );
         return;
     }
 
@@ -1739,7 +1739,7 @@ void E_(CAMStatus)( access_t * p_access )
 
         if ( sinfo.flags & CA_CI_MODULE_READY )
         {
-            en50221_mmi_object_t *p_object = E_(en50221_GetMMIObject)( p_access,
+            en50221_mmi_object_t *p_object = en50221_GetMMIObject( p_access,
                                                                        i_slot );
 
             p += sprintf( p, "module present and ready<p>\n" );
@@ -1818,7 +1818,7 @@ out:
 /*****************************************************************************
  * CAMSet :
  *****************************************************************************/
-int E_(CAMSet)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
+int CAMSet( access_t * p_access, dvbpsi_pmt_t *p_pmt )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -1828,7 +1828,7 @@ int E_(CAMSet)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
         return VLC_EGENERIC;
     }
 
-    E_(en50221_SetCAPMT)( p_access, p_pmt );
+    en50221_SetCAPMT( p_access, p_pmt );
 
     return VLC_SUCCESS;
 }
@@ -1836,11 +1836,11 @@ int E_(CAMSet)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
 /*****************************************************************************
  * CAMClose :
  *****************************************************************************/
-void E_(CAMClose)( access_t * p_access )
+void CAMClose( access_t * p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
-    E_(en50221_End)( p_access );
+    en50221_End( p_access );
 
     if ( p_sys->i_ca_handle )
     {

modules/access/mms/asf.c

@@ -45,7 +45,7 @@ static int CmpGuid( const guid_t *p_guid1, const guid_t *p_guid2 )
               p_guid1->v4[7] == p_guid2->v4[7] ) ? 1 : 0 );
 }
 
-void E_( GenerateGuid )( guid_t *p_guid )
+void  GenerateGuid ( guid_t *p_guid )
 {
     int i;
 
@@ -61,7 +61,7 @@ void E_( GenerateGuid )( guid_t *p_guid )
     }
 }
 
-void E_( asf_HeaderParse )( asf_header_t *hdr,
+void  asf_HeaderParse ( asf_header_t *hdr,
                             uint8_t *p_header, int i_header )
 {
     var_buffer_t buffer;
@@ -201,7 +201,7 @@ void E_( asf_HeaderParse )( asf_header_t *hdr,
     }
 }
 
-void E_( asf_StreamSelect ) ( asf_header_t *hdr,
+void  asf_StreamSelect  ( asf_header_t *hdr,
                               int i_bitrate_max,
                               bool b_all, bool b_audio, bool b_video )
 {

modules/access/mms/asf.h

@@ -61,9 +61,9 @@ typedef struct guid_s
 } guid_t;
 
 
-void E_( GenerateGuid )     ( guid_t * );
-void E_( asf_HeaderParse )  ( asf_header_t *, uint8_t *, int );
-void E_( asf_StreamSelect ) ( asf_header_t *,
+void  GenerateGuid      ( guid_t * );
+void  asf_HeaderParse   ( asf_header_t *, uint8_t *, int );
+void  asf_StreamSelect  ( asf_header_t *,
                               int i_bitrate_max, bool b_all, bool b_audio,
                               bool b_video );
 

modules/access/mms/mms.c

@@ -123,23 +123,23 @@ static int Open( vlc_object_t *p_this )
     {
         if( !strncmp( p_access->psz_access, "mmsu", 4 ) )
         {
-            return E_( MMSTUOpen )( p_access );
+            return  MMSTUOpen ( p_access );
         }
         else if( !strncmp( p_access->psz_access, "mmst", 4 ) )
         {
-            return E_( MMSTUOpen )( p_access );
+            return  MMSTUOpen ( p_access );
         }
         else if( !strncmp( p_access->psz_access, "mmsh", 4 ) ||
                  !strncmp( p_access->psz_access, "http", 4 ) )
         {
-            return E_( MMSHOpen )( p_access );
+            return  MMSHOpen ( p_access );
         }
     }
 
-    if( E_( MMSTUOpen )( p_access ) )
+    if(  MMSTUOpen ( p_access ) )
     {
         /* try mmsh if mmstu failed */
-        return E_( MMSHOpen )( p_access );
+        return  MMSHOpen ( p_access );
     }
     return VLC_SUCCESS;
 }
@@ -155,10 +155,10 @@ static void Close( vlc_object_t *p_this )
     if( ( p_sys->i_proto == MMS_PROTO_TCP ) ||
         ( p_sys->i_proto == MMS_PROTO_UDP ) )
     {
-        E_( MMSTUClose )( p_access );
+         MMSTUClose ( p_access );
     }
     else if( p_sys->i_proto == MMS_PROTO_HTTP )
     {
-        E_( MMSHClose )( p_access );
+         MMSHClose ( p_access );
     }
 }

modules/access/mms/mms.h

@@ -30,12 +30,12 @@
 #define MMS_PROTO_HTTP  3
 
 /* mmst and mmsu */
-int  E_( MMSTUOpen )  ( access_t * );
-void E_( MMSTUClose ) ( access_t * );
+int   MMSTUOpen   ( access_t * );
+void  MMSTUClose  ( access_t * );
 
 /* mmsh */
-int  E_( MMSHOpen )  ( access_t * );
-void E_( MMSHClose ) ( access_t * );
+int   MMSHOpen   ( access_t * );
+void  MMSHClose  ( access_t * );
 
 #endif
 

modules/access/mms/mmsh.c

@@ -49,8 +49,8 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-int  E_(MMSHOpen)  ( access_t * );
-void E_(MMSHClose) ( access_t * );
+int  MMSHOpen  ( access_t * );
+void MMSHClose ( access_t * );
 
 static ssize_t Read( access_t *, uint8_t *, size_t );
 static ssize_t ReadRedirect( access_t *, uint8_t *, size_t );
@@ -73,7 +73,7 @@ static int Reset( access_t * );