Commit 85d007c5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Don't use Apple readdir fix twice

parent e55c5705
......@@ -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, '.' );
......
......@@ -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 )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment