X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Ffields.c;h=cf08e7807af32fc2ac99822b7a65c4a5acc85f50;hb=e0f15669bbfe5c29244ba6e0eb9f1e81f26e5244;hp=412b7fdef065cc3adf0cf80bd3d35f32a5d811bb;hpb=e25dc75977dad34abd4340bd5478f9f3864a6ffd;p=babeltrace.git diff --git a/formats/ctf/ir/fields.c b/formats/ctf/ir/fields.c index 412b7fde..cf08e780 100644 --- a/formats/ctf/ir/fields.c +++ b/formats/ctf/ir/fields.c @@ -866,11 +866,10 @@ end: return container; } -const char *bt_ctf_field_enumeration_get_single_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; @@ -899,11 +898,6 @@ const char *bt_ctf_field_enumeration_get_single_mapping_name( } iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value( field->type, value); - if (!iter) { - goto error_put_container_type; - } - (void) bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned( - iter, &name, NULL, NULL); } else { int64_t value; @@ -914,11 +908,6 @@ const char *bt_ctf_field_enumeration_get_single_mapping_name( } iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value( field->type, value); - if (!iter) { - goto error_put_container_type; - } - (void) bt_ctf_field_type_enumeration_mapping_iterator_get_signed( - iter, &name, NULL, NULL); } error_put_container_type: @@ -926,8 +915,7 @@ error_put_container_type: error_put_container: bt_put(container); end: - bt_put(iter); - return name; + return iter; } int bt_ctf_field_signed_integer_get_value(struct bt_ctf_field *field,