Replace vlc_bool_t by bool, VLC_TRUE by true and VLC_FALSE by false.

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 66f0d4f4037526aeb067120bb5e82d7968b49df2..b7b77b228f4b821a85dc5201096e1290bf477c83 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -38,11 +38,15 @@ VLC_EXPORT( char *, FromLocale, ( const char * ) );
 VLC_EXPORT( char *, FromLocaleDup, ( const char * ) );
 VLC_EXPORT( char *, ToLocale, ( const char * ) );
 
+/* TODO: move all of this to "vlc_fs.h" or something like that */
 VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, mode_t mode ) );
 VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) );
 VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) );
 VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) );
+VLC_EXPORT( int, utf8_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
 VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
+VLC_EXPORT( int, utf8_mkdir, ( const char *filename, mode_t mode ) );
+VLC_EXPORT( int, utf8_unlink, ( const char *filename ) );
 
 #ifdef WIN32
 # define stat _stati64
@@ -50,10 +54,9 @@ VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*se
 
 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_mkdir, ( const char *filename ) );
 
 VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
-VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) );
+VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
 
 VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
 VLC_EXPORT( const char *, IsUTF8, ( const char * ) );
@@ -73,7 +76,7 @@ static inline char *FromWide (const wchar_t *wide)
 #endif
 
 VLC_INTERNAL( char *, vlc_fix_readdir, ( const char * ) );
-VLC_INTERNAL( vlc_bool_t, vlc_current_charset, ( char ** ) );
+VLC_INTERNAL( bool, vlc_current_charset, ( char ** ) );
 
 VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );