From be639de22180b805f99b3128b7bbf1dbbc6b50cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 22 Mar 2006 11:14:24 +0000 Subject: [PATCH] Clean up vlc_iconv prototype --- include/vlc_common.h | 2 +- include/vlc_symbols.h | 2 +- src/extras/libc.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index a7ea304e08..2a4554a95f 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -1085,7 +1085,7 @@ VLC_EXPORT( char *, vlc_wraptext, ( const char *, int ) ); /* iconv wrappers (defined in src/extras/libc.c) */ typedef void *vlc_iconv_t; VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) ); -VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, char **, size_t *, char **, size_t * ) ); +VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) ); VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) ); /* execve wrapper (defined in src/extras/libc.c) */ diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h index bfc379c3aa..4b201ca600 100644 --- a/include/vlc_symbols.h +++ b/include/vlc_symbols.h @@ -188,7 +188,7 @@ struct module_symbols_t char ** (*vlc_parse_cmdline_inner) (const char *, int *); char * (*vlc_wraptext_inner) (const char *, int); vlc_iconv_t (*vlc_iconv_open_inner) (const char *, const char *); - size_t (*vlc_iconv_inner) (vlc_iconv_t, char **, size_t *, char **, size_t *); + size_t (*vlc_iconv_inner) (vlc_iconv_t, const char **, size_t *, char **, size_t *); int (*vlc_iconv_close_inner) (vlc_iconv_t); char * (*vlc_dgettext_inner) (const char *package, const char *msgid); demux_t * (*__demux2_New_inner) (vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t); diff --git a/src/extras/libc.c b/src/extras/libc.c index 8b9f85d86d..01a180b2ae 100644 --- a/src/extras/libc.c +++ b/src/extras/libc.c @@ -613,11 +613,12 @@ vlc_iconv_t vlc_iconv_open( const char *tocode, const char *fromcode ) #endif } -size_t vlc_iconv( vlc_iconv_t cd, char **inbuf, size_t *inbytesleft, +size_t vlc_iconv( vlc_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft ) { #if defined(HAVE_ICONV) - return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); + return iconv( cd, (ICONV_CONST char **)inbuf, inbytesleft, + outbuf, outbytesleft ); #else int i_bytes; -- 2.39.5