X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=types%2Farray.c;h=d514a60a7fddf844856ea082ec2d0f68a39ceac9;hb=cfeb617e4a304a0a0dcc21886da68bae6a540435;hp=debc15aa9788d093b83a1d77a0bf0b92e246d082;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b;p=babeltrace.git

diff --git a/types/array.c b/types/array.c
index debc15aa..d514a60a 100644
--- a/types/array.c
+++ b/types/array.c
@@ -32,7 +32,7 @@
 #include <inttypes.h>
 
 static
-struct bt_definition *_array_definition_new(struct declaration *declaration,
+struct bt_definition *_array_definition_new(struct bt_declaration *declaration,
 			struct definition_scope *parent_scope,
 			GQuark field_name, int index, const char *root_name);
 static
@@ -59,7 +59,7 @@ int bt_array_rw(struct bt_stream_pos *pos, struct bt_definition *definition)
 }
 
 static
-void _array_declaration_free(struct declaration *declaration)
+void _array_declaration_free(struct bt_declaration *declaration)
 {
 	struct declaration_array *array_declaration =
 		container_of(declaration, struct declaration_array, p);
@@ -71,11 +71,11 @@ void _array_declaration_free(struct declaration *declaration)
 
 struct declaration_array *
 	bt_array_declaration_new(size_t len,
-			      struct declaration *elem_declaration,
+			      struct bt_declaration *elem_declaration,
 			      struct declaration_scope *parent_scope)
 {
 	struct declaration_array *array_declaration;
-	struct declaration *declaration;
+	struct bt_declaration *declaration;
 
 	array_declaration = g_new(struct declaration_array, 1);
 	declaration = &array_declaration->p;
@@ -83,7 +83,7 @@ struct declaration_array *
 	bt_declaration_ref(elem_declaration);
 	array_declaration->elem = elem_declaration;
 	array_declaration->scope = bt_new_declaration_scope(parent_scope);
-	declaration->id = CTF_TYPE_ARRAY;
+	declaration->id = BT_CTF_TYPE_ID_ARRAY;
 	declaration->alignment = elem_declaration->alignment;
 	declaration->declaration_free = _array_declaration_free;
 	declaration->definition_new = _array_definition_new;
@@ -94,7 +94,7 @@ struct declaration_array *
 
 static
 struct bt_definition *
-	_array_definition_new(struct declaration *declaration,
+	_array_definition_new(struct bt_declaration *declaration,
 			      struct definition_scope *parent_scope,
 			      GQuark field_name, int index, const char *root_name)
 {
@@ -123,7 +123,7 @@ struct bt_definition *
 	array->string = NULL;
 	array->elems = NULL;
 
-	if (array_declaration->elem->id == CTF_TYPE_INTEGER) {
+	if (array_declaration->elem->id == BT_CTF_TYPE_ID_INTEGER) {
 		struct declaration_integer *integer_declaration =
 			container_of(array_declaration->elem, struct declaration_integer, p);
 
@@ -131,11 +131,6 @@ struct bt_definition *
 		      || integer_declaration->encoding == CTF_STRING_ASCII) {
 
 			array->string = g_string_new("");
-
-			if (integer_declaration->len == CHAR_BIT
-			    && integer_declaration->p.alignment == CHAR_BIT) {
-				return &array->p;
-			}
 		}
 	}
 
@@ -229,12 +224,12 @@ GString *bt_get_char_array(const struct bt_definition *field)
 {
 	struct definition_array *array_definition;
 	struct declaration_array *array_declaration;
-	struct declaration *elem;
+	struct bt_declaration *elem;
 
 	array_definition = container_of(field, struct definition_array, p);
 	array_declaration = array_definition->declaration;
 	elem = array_declaration->elem;
-	if (elem->id == CTF_TYPE_INTEGER) {
+	if (elem->id == BT_CTF_TYPE_ID_INTEGER) {
 		struct declaration_integer *integer_declaration =
 			container_of(elem, struct declaration_integer, p);