X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libi3%2Fucs2_conversion.c;h=398c1ae58112566da771035a578ce222f99d2a8e;hb=0b5a2092a08f7e4463b5d52e11d84750af84e73c;hp=b583e32cd6a4f9ba667748d5bd423d994bb595c9;hpb=419b73be9e6e502760878f8372a7d51975c0cdce;p=i3%2Fi3 diff --git a/libi3/ucs2_conversion.c b/libi3/ucs2_conversion.c index b583e32c..398c1ae5 100644 --- a/libi3/ucs2_conversion.c +++ b/libi3/ucs2_conversion.c @@ -5,14 +5,14 @@ * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * */ +#include "libi3.h" + #include #include #include #include #include -#include "libi3.h" - static iconv_t utf8_conversion_descriptor = (iconv_t)-1; static iconv_t ucs2_conversion_descriptor = (iconv_t)-1; @@ -83,8 +83,7 @@ xcb_char2b_t *convert_utf8_to_ucs2(char *input, size_t *real_strlen) { } /* Do the conversion */ - size_t rc = iconv(ucs2_conversion_descriptor, (char **)&input, - &input_size, (char **)&output, &output_size); + size_t rc = iconv(ucs2_conversion_descriptor, &input, &input_size, (char **)&output, &output_size); if (rc == (size_t)-1) { perror("Converting to UCS-2 failed"); free(buffer);