X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_charset.h;h=0788b17f2487a22747d8e75dd6f05dac615c1d70;hb=be378fbc80c384e2541517d6853b59411b7e67de;hp=eec9d42973204f2b66529bd852900ad3b52175ec;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/include/vlc_charset.h b/include/vlc_charset.h index eec9d42973..0788b17f24 100644 --- a/include/vlc_charset.h +++ b/include/vlc_charset.h @@ -33,12 +33,17 @@ VLC_EXPORT( void, LocaleFree, ( const char * ) ); VLC_EXPORT( char *, FromLocale, ( const char * ) ); VLC_EXPORT( char *, FromLocaleDup, ( const char * ) ); VLC_EXPORT( char *, ToLocale, ( const char * ) ); +VLC_EXPORT( char *, ToLocaleDup, ( 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 @@ -46,10 +51,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 *, ... ) LIBVLC_FORMAT( 2, 3 ) ); VLC_EXPORT( char *, EnsureUTF8, ( char * ) ); VLC_EXPORT( const char *, IsUTF8, ( const char * ) ); @@ -68,13 +72,8 @@ 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_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 * ) );