Return DIR from utf8_open to avoid casting bugs

diff --git a/include/charset.h b/include/charset.h
index f0e637e58a111ea734e68d232e371dda3d434f70..f31166036e51ad237cf9583e6e62bf8e4be58d3e 100644 (file)
--- a/include/charset.h
+++ b/include/charset.h
@@ -27,6 +27,7 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
+#include <dirent.h>
 
 VLC_EXPORT( void, LocaleFree, ( const char * ) );
 VLC_EXPORT( char *, FromLocale, ( const char * ) );
@@ -35,7 +36,7 @@ VLC_EXPORT( char *, ToLocale, ( const char * ) );
 
 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( void *, utf8_opendir, ( const char *dirname ) );
+VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) );
 VLC_EXPORT( char *, utf8_readdir, ( void *dir ) );
 VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
 

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 41f1bda4e8ae184ea9517c4791095674c1c53adc..48d7fec78a59a0eb90ae0b2e0395ebb3c5ba2b5c 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -466,7 +466,7 @@ struct module_symbols_t
     void *vlc_HashInsert_deprecated;
     void *vlc_HashLookup_deprecated;
     void *vlc_HashRetrieve_deprecated;
-    void * (*utf8_opendir_inner) (const char *dirname);
+    DIR * (*utf8_opendir_inner) (const char *dirname);
     FILE * (*utf8_fopen_inner) (const char *filename, const char *mode);
     char * (*utf8_readdir_inner) (void *dir);
     int (*utf8_stat_inner) (const char *filename, struct stat *buf);

diff --git a/src/misc/unicode.c b/src/misc/unicode.c
index 76f2f1d8a35f60a0db6efc274e533dfbf20678de..03b167e305cd45b317bc9a7778b8e18b83bb38c1 100644 (file)
--- a/src/misc/unicode.c
+++ b/src/misc/unicode.c
@@ -427,7 +427,7 @@ int utf8_mkdir( const char *dirname )
 }
 
 
-void *utf8_opendir( const char *dirname )
+DIR *utf8_opendir( const char *dirname )
 {
     /* TODO: support for WinNT non-ACP filenames */
     const char *local_name = ToLocale( dirname );