Don't use Apple readdir fix twice

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index bbad22de3ea693d01fb1244fd7de6464615057a4..02d282f09f205132aef4d721f0344a23bd042c58 100644 (file)
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -573,10 +573,7 @@ mvar_t *E_(mvar_FileSetNew)( intf_thread_t *p_intf, char *name,
         }
         f = E_(mvar_New)( name, "set" );
 
-        /* FIXME: merge vlc_fix_readdir_charset with utf8_readir */
-        psz_dummy = vlc_fix_readdir_charset( p_intf, psz_dir_content );
-        psz_name = E_(FromUTF8)( p_intf, psz_dummy );
-        free( psz_dummy );
+        psz_name = E_(FromUTF8)( p_intf, psz_dir_content );
 
         /* put lower-case file extension in 'ext' */
         psz_ext = strrchr( psz_name, '.' );

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 9dc7d8f7053419e103d0c063251ccf683a0c8b11..99b184e33378715721eb5ca8762c4e80e59c7f1b 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -213,15 +213,10 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
             httpd_file_sys_t *f = NULL;
             httpd_handler_sys_t *h = NULL;
             vlc_bool_t b_index;
-            char *psz_tmp, *psz_file, *psz_name, *psz_ext;
-
-            psz_tmp = vlc_fix_readdir_charset( p_intf, dir );
-            psz_file = E_(FromUTF8)( p_intf, psz_tmp );
-            free( psz_tmp );
-            psz_tmp = vlc_fix_readdir_charset( p_intf,
-                                               &dir[strlen( psz_root )] );
-            psz_name = E_(FileToUrl)( psz_tmp, &b_index );
-            free( psz_tmp );
+            char *psz_file, *psz_name, *psz_ext;
+
+            psz_file = E_(FromUTF8)( p_intf, dir );
+            psz_name = E_(FileToUrl)( &dir[strlen( psz_root )], &b_index );
             psz_ext = strrchr( psz_file, '.' );
             if( psz_ext != NULL )
             {