DBus: remove unused macro, check memory allocation

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

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 579a350af9b077e9d56df8512960eff260d5b783..ae87e711bf4822e2299c88147198cde705a6d76b 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;
@@ -627,8 +626,7 @@ mvar_t *E_(mvar_FileSetNew)( intf_thread_t *p_intf, char *name,
     }
 
     free( psz_dir );
-    if( ppsz_dir_content != NULL )
-        free( ppsz_dir_content );
+    free( ppsz_dir_content );
     return s;
 }