Merge branch 'master' into next

[i3/i3] / libi3 / ucs2_conversion.c

diff --git a/libi3/ucs2_conversion.c b/libi3/ucs2_conversion.c
index 6f7cf28749a50a966459ceadc4b383fb3caa69d1..3a7d0194d45f5430ea4d783a897126f8e5f6f0eb 100644 (file)
--- a/libi3/ucs2_conversion.c
+++ b/libi3/ucs2_conversion.c
@@ -2,7 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
 #include <err.h>
@@ -24,7 +24,7 @@ static iconv_t ucs2_conversion_descriptor = (iconv_t)-1;
 char *convert_ucs2_to_utf8(xcb_char2b_t *text, size_t num_glyphs) {
     /* Allocate the output buffer (UTF-8 is at most 4 bytes per glyph) */
     size_t buffer_size = num_glyphs * 4 * sizeof(char) + 1;
-    char *buffer = scalloc(buffer_size * sizeof(char));
+    char *buffer = scalloc(buffer_size);
 
     /* We need to use an additional pointer, because iconv() modifies it */
     char *output = buffer;
@@ -42,8 +42,8 @@ char *convert_ucs2_to_utf8(xcb_char2b_t *text, size_t num_glyphs) {
 
     /* Do the conversion */
     size_t input_len = num_glyphs * sizeof(xcb_char2b_t);
-    size_t rc = iconv(utf8_conversion_descriptor, (char**)&text,
-            &input_len, &output, &output_size);
+    size_t rc = iconv(utf8_conversion_descriptor, (char **)&text,
+                      &input_len, &output, &output_size);
     if (rc == (size_t)-1) {
         perror("Converting to UTF-8 failed");
         free(buffer);
@@ -83,8 +83,8 @@ 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, (char **)&input,
+                      &input_size, (char **)&output, &output_size);
     if (rc == (size_t)-1) {
         perror("Converting to UCS-2 failed");
         free(buffer);