X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Ffields.c;h=0ad52a020dc05a79095c506ca13941e016187190;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=2df961f4b61e90bf049247717bb267bb0eb5ec00;hpb=76f869abeb1faef01e89ae83399faa231e10cc9e;p=babeltrace.git

diff --git a/formats/ctf/ir/fields.c b/formats/ctf/ir/fields.c
index 2df961f4..0ad52a02 100644
--- a/formats/ctf/ir/fields.c
+++ b/formats/ctf/ir/fields.c
@@ -866,15 +866,14 @@ end:
 	return container;
 }
 
-const char *bt_ctf_field_enumeration_get_mapping_name(
-	struct bt_ctf_field *field)
+struct bt_ctf_field_type_enumeration_mapping_iterator *
+bt_ctf_field_enumeration_get_mappings(struct bt_ctf_field *field)
 {
 	int ret;
-	const char *name = NULL;
 	struct bt_ctf_field *container = NULL;
 	struct bt_ctf_field_type *container_type = NULL;
 	struct bt_ctf_field_type_integer *integer_type = NULL;
-	struct bt_ctf_field_type_enumeration *enumeration_type = NULL;
+	struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
 
 	container = bt_ctf_field_enumeration_get_container(field);
 	if (!container) {
@@ -888,29 +887,27 @@ const char *bt_ctf_field_enumeration_get_mapping_name(
 
 	integer_type = container_of(container_type,
 		struct bt_ctf_field_type_integer, parent);
-	enumeration_type = container_of(field->type,
-		struct bt_ctf_field_type_enumeration, parent);
 
 	if (!integer_type->declaration.signedness) {
 		uint64_t value;
+
 		ret = bt_ctf_field_unsigned_integer_get_value(container,
 		      &value);
 		if (ret) {
 			goto error_put_container_type;
 		}
-
-		name = bt_ctf_field_type_enumeration_get_mapping_name_unsigned(
-			enumeration_type, value);
+		iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(
+				field->type, value);
 	} else {
 		int64_t value;
+
 		ret = bt_ctf_field_signed_integer_get_value(container,
 		      &value);
 		if (ret) {
 			goto error_put_container_type;
 		}
-
-		name = bt_ctf_field_type_enumeration_get_mapping_name_signed(
-			enumeration_type, value);
+		iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(
+				field->type, value);
 	}
 
 error_put_container_type:
@@ -918,7 +915,7 @@ error_put_container_type:
 error_put_container:
 	bt_put(container);
 end:
-	return name;
+	return iter;
 }
 
 int bt_ctf_field_signed_integer_get_value(struct bt_ctf_field *field,
@@ -1687,7 +1684,7 @@ int bt_ctf_field_array_validate(struct bt_ctf_field *field)
 	for (i = 0; i < array->elements->len; i++) {
 		ret = bt_ctf_field_validate(array->elements->pdata[i]);
 		if (ret) {
-			fprintf(stderr, "Failed to validate sequence field #%zu\n", i);
+			fprintf(stderr, "Failed to validate array field #%zu\n", i);
 			goto end;
 		}
 	}
@@ -1906,6 +1903,10 @@ int bt_ctf_field_integer_serialize(struct bt_ctf_field *field,
 	struct bt_ctf_field_integer *integer = container_of(field,
 		struct bt_ctf_field_integer, parent);
 
+	if (!bt_ctf_field_generic_is_set(field)) {
+		ret = -1;
+		goto end;
+	}
 retry:
 	ret = ctf_integer_write(&pos->parent, &integer->definition.p);
 	if (ret == -EFAULT) {
@@ -1941,6 +1942,10 @@ int bt_ctf_field_floating_point_serialize(struct bt_ctf_field *field,
 	struct bt_ctf_field_floating_point *floating_point = container_of(field,
 		struct bt_ctf_field_floating_point, parent);
 
+	if (!bt_ctf_field_generic_is_set(field)) {
+		ret = -1;
+		goto end;
+	}
 retry:
 	ret = ctf_float_write(&pos->parent, &floating_point->definition.p);
 	if (ret == -EFAULT) {
@@ -1982,20 +1987,20 @@ int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
 	}
 
 	for (i = 0; i < structure->fields->len; i++) {
-		struct bt_ctf_field *field = g_ptr_array_index(
+		struct bt_ctf_field *member = g_ptr_array_index(
 			structure->fields, i);
 
-		ret = bt_ctf_field_serialize(field, pos);
+		ret = bt_ctf_field_serialize(member, pos);
 		if (ret) {
 			const char *name;
-			struct bt_ctf_field_type *field_type =
+			struct bt_ctf_field_type *structure_type =
 					bt_ctf_field_get_type(field);
 
-			(void) bt_ctf_field_type_structure_get_field(field_type,
-					&name, NULL, i);
+			(void) bt_ctf_field_type_structure_get_field(
+					structure_type, &name, NULL, i);
 			fprintf(stderr, "Field %s failed to serialize\n",
 					name ? name : "NULL");
-			bt_put(field_type);
+			bt_put(structure_type);
 			break;
 		}
 	}
@@ -2523,7 +2528,7 @@ bool bt_ctf_field_array_is_set(struct bt_ctf_field *field)
 
 	array = container_of(field, struct bt_ctf_field_array, parent);
 	for (i = 0; i < array->elements->len; i++) {
-		is_set = bt_ctf_field_validate(array->elements->pdata[i]);
+		is_set = bt_ctf_field_is_set(array->elements->pdata[i]);
 		if (!is_set) {
 			goto end;
 		}