X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Farray.c;h=23413dd1e8b4d780f49018fca2521c69ebd7c889;hb=e7f1ad36b82bb8651c91c6c6faf8b92f145f32bc;hp=ea3ecfd8a656d5db9b4f389ee1302b5b6b5926ca;hpb=92c6a024cd3e81293bd39fd2b322e12ce57ea502;p=babeltrace.git

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index ea3ecfd8..23413dd1 100644
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -42,23 +42,21 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 		struct declaration_integer *integer_declaration =
 			container_of(elem, struct declaration_integer, p);
 
-		if (integer_declaration->encoding == CTF_STRING_UTF8
-		      || integer_declaration->encoding == CTF_STRING_ASCII) {
+		if (bt_int_is_char(elem)) {
+			if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+				return -EFAULT;
+			if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+				return -EFAULT;
 
-			if (integer_declaration->len == CHAR_BIT
-			    && integer_declaration->p.alignment == CHAR_BIT) {
-
-				ctf_align_pos(pos, integer_declaration->p.alignment);
-				if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
-					return -EFAULT;
-
-				g_string_assign(array_definition->string, "");
-				g_string_insert_len(array_definition->string,
-					0, (char *) ctf_get_pos_addr(pos),
-					array_declaration->len);
-				ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
-				return 0;
-			}
+			g_string_assign(array_definition->string, "");
+			g_string_insert_len(array_definition->string,
+				0, (char *) ctf_get_pos_addr(pos),
+				array_declaration->len);
+			/*
+			 * We want to populate both the string
+			 * and the underlying values, so carry
+			 * on calling bt_array_rw().
+			 */
 		}
 	}
 	return bt_array_rw(ppos, definition);
@@ -78,22 +76,18 @@ int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition
 		struct declaration_integer *integer_declaration =
 			container_of(elem, struct declaration_integer, p);
 
-		if (integer_declaration->encoding == CTF_STRING_UTF8
-		      || integer_declaration->encoding == CTF_STRING_ASCII) {
-
-			if (integer_declaration->len == CHAR_BIT
-			    && integer_declaration->p.alignment == CHAR_BIT) {
-
-				ctf_align_pos(pos, integer_declaration->p.alignment);
-				if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
-					return -EFAULT;
+		if (bt_int_is_char(elem)) {
+			if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+				return -EFAULT;
+			if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+				return -EFAULT;
 
-				memcpy((char *) ctf_get_pos_addr(pos),
-					array_definition->string->str,
-					array_declaration->len);
-				ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
-				return 0;
-			}
+			memcpy((char *) ctf_get_pos_addr(pos),
+				array_definition->string->str,
+				array_declaration->len);
+			if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+				return -EFAULT;
+			return 0;
 		}
 	}
 	return bt_array_rw(ppos, definition);