Changeset be639de22180b805f99b3128b7bbf1dbbc6b50cc

Show
Ignore:
Timestamp:
22/03/06 12:14:24 (3 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1143026064 +0000
git-parent:

[57d2f9918c78357e347d50432cbd49e8b867d2ce]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1143026064 +0000
Message:

Clean up vlc_iconv prototype

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_common.h

    r5ac87d0 rbe639de2  
    10861086typedef void *vlc_iconv_t; 
    10871087VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) ); 
    1088 VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, char **, size_t *, char **, size_t * ) ); 
     1088VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) ); 
    10891089VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) ); 
    10901090 

  • include/vlc_symbols.h

    r647cc79 rbe639de2  
    189189    char * (*vlc_wraptext_inner) (const char *, int); 
    190190    vlc_iconv_t (*vlc_iconv_open_inner) (const char *, const char *); 
    191     size_t (*vlc_iconv_inner) (vlc_iconv_t, char **, size_t *, char **, size_t *); 
     191    size_t (*vlc_iconv_inner) (vlc_iconv_t, const char **, size_t *, char **, size_t *); 
    192192    int (*vlc_iconv_close_inner) (vlc_iconv_t); 
    193193    char * (*vlc_dgettext_inner) (const char *package, const char *msgid); 

  • src/extras/libc.c

    r5ac87d0 rbe639de2  
    614614} 
    615615 
    616 size_t vlc_iconv( vlc_iconv_t cd, char **inbuf, size_t *inbytesleft, 
     616size_t vlc_iconv( vlc_iconv_t cd, const char **inbuf, size_t *inbytesleft, 
    617617                  char **outbuf, size_t *outbytesleft ) 
    618618{ 
    619619#if defined(HAVE_ICONV) 
    620     return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); 
     620    return iconv( cd, (ICONV_CONST char **)inbuf, inbytesleft, 
     621                  outbuf, outbytesleft ); 
    621622#else 
    622623    int i_bytes;