block: cancellation safety

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 77678cd7a68fdc3d392bada75c8ad23f41660f56..5bd3faa429b145fe0128c04f1b639668b03997da 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -22,12 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+#ifndef VLC_CHARSET_H
+#define VLC_CHARSET_H 1
 
-#ifndef __VLC_CHARSET_H
-#define __VLC_CHARSET_H 1
+/**
+ * \file
+ * This files handles locale conversions in vlc
+ */
 
 #include <stdarg.h>
 #include <sys/types.h>
@@ -57,7 +58,7 @@ VLC_EXPORT( int, utf8_stat, ( const char *filename, struct stat *buf ) );
 VLC_EXPORT( int, utf8_lstat, ( const char *filename, struct stat *buf ) );
 
 VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
-VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
+VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) );
 
 VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
 VLC_EXPORT( const char *, IsUTF8, ( const char * ) );
@@ -71,18 +72,14 @@ static inline char *FromWide (const wchar_t *wide)
 
     char *out = (char *)malloc (len);
 
-    WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
+    if (out)
+        WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
     return out;
 }
 #endif
 
-VLC_INTERNAL( char *, vlc_fix_readdir, ( const char * ) );
-VLC_INTERNAL( bool, vlc_current_charset, ( char ** ) );
-
 VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
 
-VLC_INTERNAL( double, i18n_strtod, ( const char *, char ** ) );
-VLC_INTERNAL( double, i18n_atof, ( const char * ) );
 VLC_EXPORT( double, us_strtod, ( const char *, char ** ) );
 VLC_EXPORT( double, us_atof, ( const char * ) );