services_discovery/: fix warnings

modules/services_discovery/bonjour.c

@@ -122,6 +122,11 @@ static void resolve_callback(
     services_discovery_t *p_sd = ( services_discovery_t* )userdata;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
     
+    VLC_UNUSED(interface); VLC_UNUSED(host_name);
+#ifdef HAVE_AVAHI_06
+    VLC_UNUSED(flags);
+#endif
+
 #ifdef HAVE_AVAHI_06
     if( event == AVAHI_RESOLVER_FAILURE )
 #else
@@ -216,6 +221,10 @@ static void browse_callback(
 #endif
     void* userdata )
 {
+    VLC_UNUSED(b);
+#ifdef HAVE_AVAHI_06
+    VLC_UNUSED(flags);
+#endif
     services_discovery_t *p_sd = ( services_discovery_t* )userdata;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
     if( event == AVAHI_BROWSER_NEW )

modules/services_discovery/hal.c

@@ -191,7 +191,7 @@ static void Close( vlc_object_t *p_this )
 
 static void AddItem( services_discovery_t *p_sd, input_item_t * p_input
 #ifdef HAVE_HAL_1
-                ,char* psz_device
+                , const char* psz_device
 #endif
                     )
 {
@@ -212,7 +212,7 @@ static void AddItem( services_discovery_t *p_sd, input_item_t * p_input
 #endif
 }
 
-static void AddDvd( services_discovery_t *p_sd, char *psz_device )
+static void AddDvd( services_discovery_t *p_sd, const char *psz_device )
 {
     char *psz_name;
     char *psz_uri;
@@ -247,7 +247,7 @@ static void AddDvd( services_discovery_t *p_sd, char *psz_device )
 }
 
 #ifdef HAVE_HAL_1
-static void DelItem( services_discovery_t *p_sd, char* psz_udi )
+static void DelItem( services_discovery_t *p_sd, const char* psz_udi )
 {
     services_discovery_sys_t    *p_sys  = p_sd->p_sys;
 
@@ -267,7 +267,7 @@ static void DelItem( services_discovery_t *p_sd, char* psz_udi )
 }
 #endif
 
-static void AddCdda( services_discovery_t *p_sd, char *psz_device )
+static void AddCdda( services_discovery_t *p_sd, const char *psz_device )
 {
     char *psz_uri;
     char *psz_blockdevice;
@@ -294,7 +294,7 @@ static void AddCdda( services_discovery_t *p_sd, char *psz_device )
     vlc_gc_decref( p_input );
 }
 
-static void ParseDevice( services_discovery_t *p_sd, char *psz_device )
+static void ParseDevice( services_discovery_t *p_sd, const char *psz_device )
 {
     char *psz_disc_type;
     services_discovery_sys_t    *p_sys  = p_sd->p_sys;
@@ -381,11 +381,13 @@ static void Run( services_discovery_t *p_sd )
 #ifdef HAVE_HAL_1
 void DeviceAdded( LibHalContext *p_ctx, const char *psz_udi )
 {
-        ParseDevice( p_sd_global, (char*) psz_udi );
+    VLC_UNUSED(p_ctx);
+    ParseDevice( p_sd_global, psz_udi );
 }
 void DeviceRemoved( LibHalContext *p_ctx, const char *psz_udi )
 {
-        DelItem( p_sd_global, (char*) psz_udi );
+    VLC_UNUSED(p_ctx);
+    DelItem( p_sd_global, psz_udi );
 }
 #endif
 

modules/services_discovery/podcast.c

@@ -189,6 +189,8 @@ static int UrlsChange( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval,
                        void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
+    VLC_UNUSED(newval);
     services_discovery_sys_t *p_sys  = (services_discovery_sys_t *)p_data;
     p_sys->b_update = VLC_TRUE;
     return VLC_SUCCESS;

modules/services_discovery/sap.c

@@ -685,6 +685,7 @@ static int Demux( demux_t *p_demux )
 
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
+    VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
     return VLC_EGENERIC;
 }
 

modules/services_discovery/shout.c

@@ -244,4 +244,5 @@ static void Run( services_discovery_t *p_sd )
  *****************************************************************************/
 static void Close( vlc_object_t *p_this )
 {
+    VLC_UNUSED(p_this);
 }