[vlc-commits] Revert "src: Fix for Mac OS X filesystem filename encoding"

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug 22 17:07:08 2013 +0200| [dd35ada4281531966235373b177c00fd1b1dc5cf] | committer: Felix Paul Kühne

Revert "src: Fix for Mac OS X filesystem filename encoding"

This reverts commit 0970461e97dc0dbd54006c7e7a9da80990f946a0.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd35ada4281531966235373b177c00fd1b1dc5cf
---

 src/text/url.c |   14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/text/url.c b/src/text/url.c
index c809fbe..40043ba 100644
--- a/src/text/url.c
+++ b/src/text/url.c
@@ -32,7 +32,6 @@
 
 #include <vlc_common.h>
 #include <vlc_url.h>
-#include <vlc_charset.h>
 #include <vlc_fs.h>
 #include <ctype.h>
 
@@ -171,19 +170,6 @@ char *vlc_path2uri (const char *path, const char *scheme)
     path = p;
 #endif
 
-#if defined( __APPLE__ )
-    /* Mac OS X uses Unicode for their files and folder name with HFS+:
-     * Unicode Normalization Form D (NFD) (with some modification).
-     * But simply converting to NFC causes some problem.
-     * So using UTF-8-MAC, encoding for HFS+, to convert to UTF-8.
-     *
-     * Note: UTF-8-MAC is only implemented for built-in iconv on Mac OS X.
-     */
-    char* psz_tmp_path = FromCharset("UTF-8-MAC", path, strlen(path));
-    strcpy((char *)path, psz_tmp_path);
-    free(psz_tmp_path);
-#endif
-
 #if defined( _WIN32 ) || defined( __OS2__ )
     /* Drive letter */
     if (isalpha ((unsigned char)path[0]) && (path[1] == ':'))