Partly revert [20969]. fix #1311
authorRafaël Carré <funman@videolan.org>
Tue, 9 Oct 2007 14:05:57 +0000 (14:05 +0000)
committerRafaël Carré <funman@videolan.org>
Tue, 9 Oct 2007 14:05:57 +0000 (14:05 +0000)
modules/control/http/mvar.c

index 0156c8a..48ddad8 100644 (file)
@@ -506,7 +506,7 @@ mvar_t *E_(mvar_HttpdInfoSetNew)( char *name, httpd_t *p_httpd, int i_type )
 #endif
 
 mvar_t *E_(mvar_FileSetNew)( intf_thread_t *p_intf, char *name,
 #endif
 
 mvar_t *E_(mvar_FileSetNew)( intf_thread_t *p_intf, char *name,
-                             const char *value )
+                             const char *psz_dir )
 {
     mvar_t *s = E_(mvar_New)( name, "set" );
 #ifdef HAVE_SYS_STAT_H
 {
     mvar_t *s = E_(mvar_New)( name, "set" );
 #ifdef HAVE_SYS_STAT_H
@@ -514,8 +514,7 @@ mvar_t *E_(mvar_FileSetNew)( intf_thread_t *p_intf, char *name,
 #endif
     char        **ppsz_dir_content;
     int           i_dir_content, i;
 #endif
     char        **ppsz_dir_content;
     int           i_dir_content, i;
-#warning Obvious bug here:
-    char         *psz_dir = E_(RealPath)( p_intf, psz_dir );
+    psz_dir = E_(RealPath)( p_intf, psz_dir );
 
 #ifdef HAVE_SYS_STAT_H
     if( (utf8_stat( psz_dir, &stat_info ) == -1 )
 
 #ifdef HAVE_SYS_STAT_H
     if( (utf8_stat( psz_dir, &stat_info ) == -1 )