control/http:

    mvar_InfoSetNew(): removes unused parameter
    avoids unused parameter warnings from httpd callbacks

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 3d238fcae67689599a1a6799b6c9aaae1f1fe526..661fb1fa2d3e1c17a3991c17c0b2077490a86ae0 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -563,6 +563,7 @@ int  E_(HttpCallback)( httpd_file_sys_t *p_args,
                        uint8_t *_p_request,
                        uint8_t **_pp_data, int *pi_data )
 {
+    VLC_UNUSED(p_file);
     char *p_request = (char *)_p_request;
     char **pp_data = (char **)_pp_data;
     FILE *f;
@@ -607,6 +608,7 @@ int  E_(HandlerCallback)( httpd_handler_sys_t *p_args,
                           char *psz_remote_addr, char *psz_remote_host,
                           uint8_t **_pp_data, int *pi_data )
 {
+    VLC_UNUSED(p_handler); VLC_UNUSED(_p_in);
     char *p_url = (char *)_p_url;
     char *p_request = (char *)_p_request;
     char **pp_data = (char **)_pp_data;
@@ -834,6 +836,10 @@ int  E_(ArtCallback)( httpd_handler_sys_t *p_args,
                           char *psz_remote_addr, char *psz_remote_host,
                           uint8_t **pp_data, int *pi_data )
 {
+    VLC_UNUSED(p_handler); VLC_UNUSED(_p_url); VLC_UNUSED(i_type); 
+    VLC_UNUSED(p_in); VLC_UNUSED(i_in); VLC_UNUSED(psz_remote_addr); 
+    VLC_UNUSED(psz_remote_host); 
+
     char *psz_art = NULL;
     intf_thread_t *p_intf = p_args->file.p_intf;
     intf_sys_t *p_sys = p_intf->p_sys;

diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index a5fdd021e3d44461a3ef0a704120ba347d85b094..0eae1650afeb44b03b3ea22f9bad3a3ba2c66e3c 100644 (file)
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -208,8 +208,7 @@ mvar_t *E_(mvar_PlaylistSetNew)( intf_thread_t *p_intf, char *name,
                                  playlist_t *p_pl );
 /** This function creates a set variable with the contents of the Stream
  * and media info box */
-mvar_t *E_(mvar_InfoSetNew)( intf_thread_t *p_intf, char *name,
-                             input_thread_t *p_input );
+mvar_t *E_(mvar_InfoSetNew)( char *name, input_thread_t *p_input );
 /** This function creates a set variable with the input parameters */
 mvar_t *E_(mvar_InputVarSetNew)( intf_thread_t *p_intf, char *name,
                                  input_thread_t *p_input,

diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c
index 450a0e4106b212552978f6c47349c4cdc80c98bb..acf8ab6f5753f968ead4107ce132efeb55360ebd 100644 (file)
--- a/modules/control/http/macro.c
+++ b/modules/control/http/macro.c
@@ -1024,7 +1024,7 @@ void E_(Execute)( httpd_file_sys_t *p_args,
                         }
                         else if( !strcmp( m.param2, "information" ) )
                         {
-                            index = E_(mvar_InfoSetNew)( p_intf, m.param1,
+                            index = E_(mvar_InfoSetNew)( m.param1,
                                                      p_intf->p_sys->p_input );
                         }
                         else if( !strcmp( m.param2, "program" )

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 579a350af9b077e9d56df8512960eff260d5b783..bdbe91c3ae101b3b072b75259d5c9bf375c31a0f 100644 (file)
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -291,8 +291,7 @@ mvar_t *E_(mvar_PlaylistSetNew)( intf_thread_t *p_intf, char *name,
     return s;
 }
 
-mvar_t *E_(mvar_InfoSetNew)( intf_thread_t *p_intf, char *name,
-                             input_thread_t *p_input )
+mvar_t *E_(mvar_InfoSetNew)( char *name, input_thread_t *p_input )
 {
     mvar_t *s = E_(mvar_New)( name, "set" );
     int i, j;