1 files changed, 10 insertions, 19 deletions
diff --git a/tests/src/x-common.c b/tests/src/x-common.c
index 82249cd5..695a6a51 100644
--- a/tests/src/x-common.c
+++ b/tests/src/x-common.c
@@ -28,10 +28,8 @@ read_card8 (const guint8 *buffer, gsize buffer_length, gsize *offset)
 guint16
 read_card16 (const guint8 *buffer, gsize buffer_length, guint8 byte_order, gsize *offset)
 {
-    guint8 a, b;
-
-    a = read_card8 (buffer, buffer_length, offset);
-    b = read_card8 (buffer, buffer_length, offset);
+    guint8 a = read_card8 (buffer, buffer_length, offset);
+    guint8 b = read_card8 (buffer, buffer_length, offset);
     if (byte_order == X_BYTE_ORDER_MSB)
         return a << 8 | b;
     else
@@ -41,12 +39,10 @@ read_card16 (const guint8 *buffer, gsize buffer_length, guint8 byte_order, gsize
 guint32
 read_card32 (const guint8 *buffer, gsize buffer_length, guint8 byte_order, gsize *offset)
 {
-    guint8 a, b, c, d;
-
-    a = read_card8 (buffer, buffer_length, offset);
-    b = read_card8 (buffer, buffer_length, offset);
-    c = read_card8 (buffer, buffer_length, offset);
-    d = read_card8 (buffer, buffer_length, offset);
+    guint8 a = read_card8 (buffer, buffer_length, offset);
+    guint8 b = read_card8 (buffer, buffer_length, offset);
+    guint8 c = read_card8 (buffer, buffer_length, offset);
+    guint8 d = read_card8 (buffer, buffer_length, offset);
     if (byte_order == X_BYTE_ORDER_MSB)
         return a << 24 | b << 16 | c << 8 | d;
     else
@@ -56,10 +52,8 @@ read_card32 (const guint8 *buffer, gsize buffer_length, guint8 byte_order, gsize
 guint8 *
 read_string8 (const guint8 *buffer, gsize buffer_length, gsize string_length, gsize *offset)
 {
-    guint8 *string;
+    guint8 *string = g_malloc (string_length + 1);
     int i;
-
-    string = g_malloc (string_length + 1);
     for (i = 0; i < string_length; i++)
         string[i] = read_card8 (buffer, buffer_length, offset);
     string[i] = '\0';
@@ -75,8 +69,7 @@ read_string (const guint8 *buffer, gsize buffer_length, gsize string_length, gsi
 gchar *
 read_padded_string (const guint8 *buffer, gsize buffer_length, gsize string_length, gsize *offset)
 {
-    guint8 *value;
-    value = read_string8 (buffer, buffer_length, string_length, offset);
+    guint8 *value = read_string8 (buffer, buffer_length, string_length, offset);
     read_padding (pad (string_length), offset);
     return (gchar *) value;
 }
@@ -93,8 +86,7 @@ write_card8 (guint8 *buffer, gsize buffer_length, guint8 value, gsize *offset)
 void
 write_padding (guint8 *buffer, gsize buffer_length, gsize length, gsize *offset)
 {
-    gsize i;
-    for (i = 0; i < length; i++)
+    for (gsize i = 0; i < length; i++)
         write_card8 (buffer, buffer_length, 0, offset);
 }
 
@@ -135,8 +127,7 @@ write_card32 (guint8 *buffer, gsize buffer_length, guint8 byte_order, guint32 va
 void
 write_string8 (guint8 *buffer, gsize buffer_length, const guint8 *value, gsize value_length, gsize *offset)
 {
-    gsize i;
-    for (i = 0; i < value_length; i++)
+    for (gsize i = 0; i < value_length; i++)
         write_card8 (buffer, buffer_length, value[i], offset);
 }