diff options
author | Eric Wong <normalperson@yhbt.net> | 2008-09-01 20:08:55 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-09-01 20:08:55 -0700 |
commit | 925843cfedcde221207ec1ab78f778dab22325f9 (patch) | |
tree | 2dcdd8497f7ca13af8a5f337b830f2dbe748c978 /src/charConv.c | |
parent | bbe4560b180e8c432c7eb7f53664605390bf67ca (diff) | |
download | mpd-925843cfedcde221207ec1ab78f778dab22325f9.tar.gz mpd-925843cfedcde221207ec1ab78f778dab22325f9.tar.xz mpd-925843cfedcde221207ec1ab78f778dab22325f9.zip |
use deconst_ptr instead of duplicating deconst logic
Diffstat (limited to 'src/charConv.c')
-rw-r--r-- | src/charConv.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/charConv.c b/src/charConv.c index c205e93e4..60bcc655a 100644 --- a/src/charConv.c +++ b/src/charConv.c @@ -95,22 +95,6 @@ int setCharSetConversion(const char *to, const char *from) #endif } -#ifdef HAVE_ICONV -static inline size_t deconst_iconv(iconv_t cd, - const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) -{ - union { - const char **a; - char **b; - } deconst; - - deconst.a = inbuf; - - return iconv(cd, deconst.b, inbytesleft, outbuf, outbytesleft); -} -#endif - char *char_conv_str(char *dest, const char *string) { if (!char_conv_to) @@ -132,11 +116,12 @@ char *char_conv_str(char *dest, const char *string) dest[0] = '\0'; while (inleft) { + char *inbuf = deconst_ptr(string); + bufferPtr = buffer; outleft = BUFFER_SIZE; - err = - deconst_iconv(char_conv_iconv, &string, &inleft, - &bufferPtr, &outleft); + err = iconv(char_conv_iconv, &inbuf, + &inleft, &bufferPtr, &outleft); if (outleft == BUFFER_SIZE || (err == (size_t)-1L && errno != E2BIG)) { return NULL; |