Merge branch 'next' into master

[i3/i3] / libi3 / ucs2_conversion.c

diff --git a/libi3/ucs2_conversion.c b/libi3/ucs2_conversion.c
index 75cff78adbdf4a5739da0834438d3c792105eb0c..398c1ae58112566da771035a578ce222f99d2a8e 100644 (file)
--- a/libi3/ucs2_conversion.c
+++ b/libi3/ucs2_conversion.c
@@ -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);