Remove E_()

[vlc] / modules / control / http / http.c

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index bf65904f93b405b29da2c87b7a68a1f87de6f00f..17377229f40be4fe9ae91d7d5362e7fc5239ec43 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -87,7 +87,7 @@ vlc_module_end();
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-int  E_(ArtCallback)( httpd_handler_sys_t *p_args,
+int  ArtCallback( httpd_handler_sys_t *p_args,
                           httpd_handler_t *p_handler, char *_p_url,
                           uint8_t *_p_request, int i_type,
                           uint8_t *_p_in, int i_in,
@@ -185,14 +185,14 @@ static int Open( vlc_object_t *p_this )
 
             p_handler = malloc( sizeof( http_association_t ) );
             p_handler->psz_ext = strdup( psz_ext );
-            psz_options = E_(FirstWord)( psz_program, psz_program );
+            psz_options = FirstWord( psz_program, psz_program );
             p_handler->i_argc = 0;
             p_handler->ppsz_argv = NULL;
             TAB_APPEND( p_handler->i_argc, p_handler->ppsz_argv,
                         strdup( psz_program ) );
             while( psz_options != NULL && *psz_options )
             {
-                char *psz_next = E_(FirstWord)( psz_options, psz_options );
+                char *psz_next = FirstWord( psz_options, psz_options );
                 TAB_APPEND( p_handler->i_argc, p_handler->ppsz_argv,
                             strdup( psz_options ) );
                 psz_options = psz_next;
@@ -300,7 +300,7 @@ static int Open( vlc_object_t *p_this )
         psz_src[strlen( psz_src ) - 1] = '\0';
     }
 
-    E_(ParseDirectory)( p_intf, psz_src, psz_src );
+    ParseDirectory( p_intf, psz_src, psz_src );
     if( p_sys->i_files <= 0 )
     {
         msg_Err( p_intf, "cannot find any file in directory %s", psz_src );
@@ -324,7 +324,7 @@ static int Open( vlc_object_t *p_this )
         /* TODO: use ACL and login/password stuff here too */
         h->p_handler = httpd_HandlerNew( p_sys->p_httpd_host,
                                          "/art", NULL, NULL, NULL,
-                                         E_(ArtCallback), h );
+                                         ArtCallback, h );
         p_sys->p_art_handler = h->p_handler;
     }
 
@@ -480,25 +480,25 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
     aout_VolumeGet( p_args->p_intf, &i_volume );
     sprintf( volume, "%d", (int)i_volume );
 
-    p_args->vars = E_(mvar_New)( "variables", "" );
-    E_(mvar_AppendNewVar)( p_args->vars, "url_param",
+    p_args->vars = mvar_New( "variables", "" );
+    mvar_AppendNewVar( p_args->vars, "url_param",
                            i_request > 0 ? "1" : "0" );
-    E_(mvar_AppendNewVar)( p_args->vars, "url_value", p_request );
-    E_(mvar_AppendNewVar)( p_args->vars, "version", VLC_Version() );
-    E_(mvar_AppendNewVar)( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
-    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
-    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_host",
+    mvar_AppendNewVar( p_args->vars, "url_value", p_request );
+    mvar_AppendNewVar( p_args->vars, "version", VLC_Version() );
+    mvar_AppendNewVar( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
+    mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
+    mvar_AppendNewVar( p_args->vars, "vlc_compile_host",
                            VLC_CompileHost() );
-    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
+    mvar_AppendNewVar( p_args->vars, "vlc_compile_domain",
                            VLC_CompileDomain() );
-    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
-    E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
-    E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
-    E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
-    E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
-    E_(mvar_AppendNewVar)( p_args->vars, "volume", volume );
-    E_(mvar_AppendNewVar)( p_args->vars, "stream_state", state );
-    E_(mvar_AppendNewVar)( p_args->vars, "charset", "UTF-8" );
+    mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() );
+    mvar_AppendNewVar( p_args->vars, "vlc_changeset", VLC_Changeset() );
+    mvar_AppendNewVar( p_args->vars, "stream_position", position );
+    mvar_AppendNewVar( p_args->vars, "stream_time", time );
+    mvar_AppendNewVar( p_args->vars, "stream_length", length );
+    mvar_AppendNewVar( p_args->vars, "volume", volume );
+    mvar_AppendNewVar( p_args->vars, "stream_state", state );
+    mvar_AppendNewVar( p_args->vars, "charset", "UTF-8" );
 
     /* Stats */
     if( p_sys->p_input )
@@ -512,9 +512,9 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
         {
             vlc_mutex_lock( &p_item->p_stats->lock );
 #define STATS_INT( n ) sprintf( stats, "%d", p_item->p_stats->i_ ## n ); \
-                       E_(mvar_AppendNewVar)( p_args->vars, #n, stats );
+                       mvar_AppendNewVar( p_args->vars, #n, stats );
 #define STATS_FLOAT( n ) sprintf( stats, "%f", p_item->p_stats->f_ ## n ); \
-                       E_(mvar_AppendNewVar)( p_args->vars, #n, stats );
+                       mvar_AppendNewVar( p_args->vars, #n, stats );
             STATS_INT( read_bytes )
             STATS_FLOAT( input_bitrate )
             STATS_INT( demux_read_bytes )
@@ -534,14 +534,14 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
         }
     }
 
-    E_(SSInit)( &p_args->stack );
+    SSInit( &p_args->stack );
 
     /* allocate output */
     *pi_data = i_buffer + 1000;
     dst = *pp_data = malloc( *pi_data );
 
     /* we parse executing all  <vlc /> macros */
-    E_(Execute)( p_args, p_request, i_request, pp_data, pi_data, &dst,
+    Execute( p_args, p_request, i_request, pp_data, pi_data, &dst,
                  &p_buffer[0], &p_buffer[i_buffer] );
 
     *dst     = '\0';
@@ -552,11 +552,11 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
         vlc_object_release( p_sys->p_input );
         p_sys->p_input = NULL;
     }
-    E_(SSClean)( &p_args->stack );
-    E_(mvar_Delete)( p_args->vars );
+    SSClean( &p_args->stack );
+    mvar_Delete( p_args->vars );
 }
 
-int  E_(HttpCallback)( httpd_file_sys_t *p_args,
+int  HttpCallback( httpd_file_sys_t *p_args,
                        httpd_file_t *p_file,
                        uint8_t *_p_request,
                        uint8_t **_pp_data, int *pi_data )
@@ -574,7 +574,7 @@ int  E_(HttpCallback)( httpd_file_sys_t *p_args,
 
     if( !p_args->b_html )
     {
-        E_(FileLoad)( f, pp_data, pi_data );
+        FileLoad( f, pp_data, pi_data );
     }
     else
     {
@@ -582,7 +582,7 @@ int  E_(HttpCallback)( httpd_file_sys_t *p_args,
         char *p_buffer;
 
         /* first we load in a temporary buffer */
-        E_(FileLoad)( f, &p_buffer, &i_buffer );
+        FileLoad( f, &p_buffer, &i_buffer );
 
         ParseExecute( p_args, p_buffer, i_buffer, p_request, pp_data, pi_data );
 
@@ -599,7 +599,7 @@ int  E_(HttpCallback)( httpd_file_sys_t *p_args,
  ****************************************************************************
  * call the external handler and parse vlc macros if Content-Type is HTML
  ****************************************************************************/
-int  E_(HandlerCallback)( httpd_handler_sys_t *p_args,
+int  HandlerCallback( httpd_handler_sys_t *p_args,
                           httpd_handler_t *p_handler, char *_p_url,
                           uint8_t *_p_request, int i_type,
                           uint8_t *_p_in, int i_in,
@@ -826,7 +826,7 @@ int  E_(HandlerCallback)( httpd_handler_sys_t *p_args,
     return VLC_SUCCESS;
 }
 
-int  E_(ArtCallback)( httpd_handler_sys_t *p_args,
+int  ArtCallback( httpd_handler_sys_t *p_args,
                           httpd_handler_t *p_handler, char *_p_url,
                           uint8_t *p_request, int i_type,
                           uint8_t *p_in, int i_in,
@@ -846,7 +846,7 @@ int  E_(ArtCallback)( httpd_handler_sys_t *p_args,
 
     psz_id[0] = '\0';
     if( p_request )
-        E_(ExtractURIValue)( (char *)p_request, "id", psz_id, 15 );
+        ExtractURIValue( (char *)p_request, "id", psz_id, 15 );
     i_id = atoi( psz_id );
     if( i_id )
     {
@@ -884,7 +884,7 @@ int  E_(ArtCallback)( httpd_handler_sys_t *p_args,
             return VLC_SUCCESS;
         }
 
-        E_(FileLoad)( f, &p_data, &i_data );
+        FileLoad( f, &p_data, &i_data );
 
         fclose( f );