X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fsequence.c;h=df91a533f01a470e20f5ea24c176f3c793245e83;hb=e7f1ad36b82bb8651c91c6c6faf8b92f145f32bc;hp=b2221eaf686a2b731c3c6d95dbb73a49e3dd3a19;hpb=1cf393f63db4dce618515749d5549564d1313ee4;p=babeltrace.git

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index b2221eaf..df91a533 100644
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -28,70 +28,61 @@
 
 #include <babeltrace/ctf/types.h>
 
-int ctf_sequence_read(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_sequence_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_sequence *sequence_definition =
 		container_of(definition, struct definition_sequence, p);
 	struct declaration_sequence *sequence_declaration =
 		sequence_definition->declaration;
-	struct declaration *elem = sequence_declaration->elem;
+	struct bt_declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
 	if (elem->id == CTF_TYPE_INTEGER) {
 		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)) {
+			uint64_t len = bt_sequence_len(sequence_definition);
 
-			if (integer_declaration->len == CHAR_BIT
-			    && integer_declaration->p.alignment == CHAR_BIT) {
-				uint64_t len = bt_sequence_len(sequence_definition);
+			if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+				return -EFAULT;
+			if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
+				return -EFAULT;
 
-				ctf_align_pos(pos, integer_declaration->p.alignment);
-				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
-					return -EFAULT;
-
-				g_string_assign(sequence_definition->string, "");
-				g_string_insert_len(sequence_definition->string,
-					0, (char *) ctf_get_pos_addr(pos), len);
-				ctf_move_pos(pos, len * CHAR_BIT);
-				return 0;
-			}
+			g_string_assign(sequence_definition->string, "");
+			g_string_insert_len(sequence_definition->string,
+				0, (char *) ctf_get_pos_addr(pos), len);
 		}
 	}
 	return bt_sequence_rw(ppos, definition);
 }
 
-int ctf_sequence_write(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_sequence_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_sequence *sequence_definition =
 		container_of(definition, struct definition_sequence, p);
 	struct declaration_sequence *sequence_declaration =
 		sequence_definition->declaration;
-	struct declaration *elem = sequence_declaration->elem;
+	struct bt_declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
 	if (elem->id == CTF_TYPE_INTEGER) {
 		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) {
-				uint64_t len = bt_sequence_len(sequence_definition);
+		if (bt_int_is_char(elem)) {
+			uint64_t len = bt_sequence_len(sequence_definition);
 
-				ctf_align_pos(pos, integer_declaration->p.alignment);
-				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
-					return -EFAULT;
+			if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+				return -EFAULT;
+			if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
+				return -EFAULT;
 
-				memcpy((char *) ctf_get_pos_addr(pos),
-					sequence_definition->string->str, len);
-				ctf_move_pos(pos, len * CHAR_BIT);
-				return 0;
-			}
+			memcpy((char *) ctf_get_pos_addr(pos),
+				sequence_definition->string->str, len);
+			if (!ctf_move_pos(pos, len * CHAR_BIT))
+				return -EFAULT;
+			return 0;
 		}
 	}
 	return bt_sequence_rw(ppos, definition);