--- libcroco-0.6.8/src/cr-utils.c.orig	2011-12-11 19:52:12.000000000 +0000
+++ libcroco-0.6.8/src/cr-utils.c	2013-10-13 16:04:24.216869500 +0000
@@ -429,8 +429,7 @@
                                   gulong a_in_len,
                                   guint32 * a_out, gulong * a_consumed)
 {
-        gulong in_len = 0,
-                in_index = 0,
+        gulong in_index = 0,
                 nb_bytes_2_decode = 0;
         enum CRStatus status = CR_OK;
 
@@ -448,8 +447,6 @@
                 goto end;
         }
 
-        in_len = a_in_len;
-
         if (*a_in <= 0x7F) {
                 /*
                  *7 bits long char
@@ -893,7 +890,6 @@
                 in_index = 0,
                 in_len = 0,
                 out_len = 0;
-        enum CRStatus status = CR_OK;
 
         g_return_val_if_fail (a_in && a_in_len
                               && a_out_len, 
@@ -906,7 +902,6 @@
         g_return_val_if_fail (a_out, CR_BAD_PARAM_ERROR) ;
 
         if (*a_in_len < 1) {
-                status = CR_OK;
                 goto end;
         }
 
@@ -951,8 +946,7 @@
                            gulong * a_in_len,
                            guchar ** a_out, gulong * a_out_len)
 {
-        gulong in_len = 0,
-                out_len = 0;
+        gulong out_len = 0;
         enum CRStatus status = CR_OK;
 
         g_return_val_if_fail (a_in && a_in_len && a_out
@@ -969,8 +963,6 @@
 
         g_return_val_if_fail (status == CR_OK, status);
 
-        in_len = *a_in_len;
-
         *a_out = g_malloc0 (out_len);
 
         status = cr_utils_ucs1_to_utf8 (a_in, a_in_len, *a_out, &out_len);
@@ -1136,7 +1128,7 @@
         *a_out_len = out_index;
         *a_in_len = in_index;
 
-        return CR_OK;
+        return status;
 }
 
 /**
