Commit c9f5dbcf authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Export utf8_vfprintf and utf8_fprintf

parent ce1c5890
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef __VLC_CHARSET_H #ifndef __VLC_CHARSET_H
#define __VLC_CHARSET_H 1 #define __VLC_CHARSET_H 1
#include <stdarg.h>
# ifdef __cplusplus # ifdef __cplusplus
extern "C" { extern "C" {
# endif # endif
...@@ -42,9 +44,8 @@ VLC_EXPORT( int, utf8_stat, ( const char *filename, void *buf ) ); ...@@ -42,9 +44,8 @@ VLC_EXPORT( int, utf8_stat, ( const char *filename, void *buf ) );
VLC_EXPORT( int, utf8_lstat, ( const char *filename, void *buf ) ); VLC_EXPORT( int, utf8_lstat, ( const char *filename, void *buf ) );
VLC_EXPORT( int, utf8_mkdir, ( const char *filename ) ); VLC_EXPORT( int, utf8_mkdir, ( const char *filename ) );
#ifndef __PLUGIN__ VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
int utf8_fprintf( FILE *, const char *, ... ); VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) );
#endif
VLC_EXPORT( char *, EnsureUTF8, ( char * ) ); VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
VLC_EXPORT( const char *, IsUTF8, ( const char * ) ); VLC_EXPORT( const char *, IsUTF8, ( const char * ) );
......
...@@ -531,6 +531,8 @@ struct module_symbols_t ...@@ -531,6 +531,8 @@ struct module_symbols_t
void (*vlc_DictClear_inner) (dict_t *); void (*vlc_DictClear_inner) (dict_t *);
dict_t * (*vlc_DictNew_inner) (void); dict_t * (*vlc_DictNew_inner) (void);
playlist_item_t * (*playlist_GetPreferredNode_inner) (playlist_t *p_playlist, playlist_item_t *p_node); playlist_item_t * (*playlist_GetPreferredNode_inner) (playlist_t *p_playlist, playlist_item_t *p_node);
int (*utf8_fprintf_inner) (FILE *, const char *, ...);
int (*utf8_vfprintf_inner) (FILE *stream, const char *fmt, va_list ap);
}; };
# if defined (__PLUGIN__) # if defined (__PLUGIN__)
# define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner # define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
...@@ -997,6 +999,8 @@ struct module_symbols_t ...@@ -997,6 +999,8 @@ struct module_symbols_t
# define vlc_DictClear (p_symbols)->vlc_DictClear_inner # define vlc_DictClear (p_symbols)->vlc_DictClear_inner
# define vlc_DictNew (p_symbols)->vlc_DictNew_inner # define vlc_DictNew (p_symbols)->vlc_DictNew_inner
# define playlist_GetPreferredNode (p_symbols)->playlist_GetPreferredNode_inner # define playlist_GetPreferredNode (p_symbols)->playlist_GetPreferredNode_inner
# define utf8_fprintf (p_symbols)->utf8_fprintf_inner
# define utf8_vfprintf (p_symbols)->utf8_vfprintf_inner
# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__) # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
/****************************************************************** /******************************************************************
* STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access. * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
...@@ -1466,6 +1470,8 @@ struct module_symbols_t ...@@ -1466,6 +1470,8 @@ struct module_symbols_t
((p_symbols)->vlc_DictClear_inner) = vlc_DictClear; \ ((p_symbols)->vlc_DictClear_inner) = vlc_DictClear; \
((p_symbols)->vlc_DictNew_inner) = vlc_DictNew; \ ((p_symbols)->vlc_DictNew_inner) = vlc_DictNew; \
((p_symbols)->playlist_GetPreferredNode_inner) = playlist_GetPreferredNode; \ ((p_symbols)->playlist_GetPreferredNode_inner) = playlist_GetPreferredNode; \
((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
(p_symbols)->net_ConvertIPv4_deprecated = NULL; \ (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
(p_symbols)->__playlist_ItemNew_deprecated = NULL; \ (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
(p_symbols)->__playlist_ItemCopy_deprecated = NULL; \ (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
......
...@@ -556,7 +556,7 @@ static int utf8_vasprintf( char **str, const char *fmt, va_list ap ) ...@@ -556,7 +556,7 @@ static int utf8_vasprintf( char **str, const char *fmt, va_list ap )
return res; return res;
} }
static int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap ) int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap )
{ {
char *str; char *str;
int res = utf8_vasprintf( &str, fmt, ap ); int res = utf8_vasprintf( &str, fmt, ap );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment