block_helper: remove dead assignments

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 4bd30ca710d222d9c265bfbbdaddfba2f6feba56..4de57ab70f369c91338676f8ca154ecab427ca5e 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -48,30 +48,7 @@ VLC_API const char * IsUTF8( const char * ) VLC_USED;
 VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) VLC_USED;
 VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) VLC_USED;
 
-#ifndef WIN32
-# define FromLocale(l) (l)
-# define ToLocale(u)   (u)
-# define LocaleFree(s) ((void)(s))
-# define FromLocaleDup strdup
-# define ToLocaleDup   strdup
-
-#else
-VLC_USED
-static inline char *FromLocale (const char *locale)
-{
-    return locale ? FromCharset ("", locale, strlen (locale)) : NULL;
-}
-
-VLC_USED
-static inline char *ToLocale (const char *utf8)
-{
-    size_t outsize;
-    return utf8 ? (char *)ToCharset ("", utf8, &outsize) : (char *)NULL;
-}
-# define LocaleFree(s) free((char *)(s))
-# define FromLocaleDup FromLocale
-# define ToLocaleDup   ToLocale
-
+#ifdef _WIN32
 VLC_USED
 static inline char *FromWide (const wchar_t *wide)
 {
@@ -135,13 +112,67 @@ static inline char *FromCodePage (unsigned cp, const char *mb)
     return utf8;
 }
 
+VLC_USED VLC_MALLOC
+static inline char *FromANSI (const char *ansi)
+{
+    return FromCodePage (GetACP (), ansi);
+}
+
+VLC_USED VLC_MALLOC
+static inline char *ToANSI (const char *utf8)
+{
+    return ToCodePage (GetACP (), utf8);
+}
+
 # ifdef UNICODE
 #  define FromT FromWide
 #  define ToT   ToWide
 # else
-#  define FromT FromLocaleDup
-#  define ToT   ToLocaleDup
+#  define FromT FromANSI
+#  define ToT   ToANSI
 # endif
+# define FromLocale    FromANSI
+# define ToLocale      ToANSI
+# define LocaleFree(s) free((char *)(s))
+# define FromLocaleDup FromANSI
+# define ToLocaleDup   ToANSI
+
+#elif defined(__OS2__)
+
+VLC_USED static inline char *FromLocale (const char *locale)
+{
+    return locale ? FromCharset ((char *)"", locale, strlen(locale)) : NULL;
+}
+
+VLC_USED static inline char *ToLocale (const char *utf8)
+{
+    size_t outsize;
+    return utf8 ? (char *)ToCharset ("", utf8, &outsize) : NULL;
+}
+
+VLC_USED static inline void LocaleFree (const char *str)
+{
+    free ((char *)str);
+}
+
+VLC_USED static inline char *FromLocaleDup (const char *locale)
+{
+    return FromCharset ("", locale, strlen(locale));
+}
+
+VLC_USED static inline char *ToLocaleDup (const char *utf8)
+{
+    size_t outsize;
+    return (char *)ToCharset ("", utf8, &outsize);
+}
+
+#else
+
+# define FromLocale(l) (l)
+# define ToLocale(u)   (u)
+# define LocaleFree(s) ((void)(s))
+# define FromLocaleDup strdup
+# define ToLocaleDup   strdup
 #endif
 
 /**