Remove BT_CTF_FIELD_TYPE_UNTAGGED_VARIANT

Also make CTF_TYPE_UNTAGGED_VARIANT have the same value as
CTF_TYPE_VARIANT: there's no distinction now.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/babeltrace/ctf-ir/field-types.h b/include/babeltrace/ctf-ir/field-types.h
index 6391f154e9680e60cba177878fd47c6663a8bdd1..6609018416efa7915b050a5b75e58a0ecf1746cd 100644 (file)
--- a/include/babeltrace/ctf-ir/field-types.h
+++ b/include/babeltrace/ctf-ir/field-types.h
@@ -211,16 +211,16 @@ struct bt_ctf_field_type_enumeration_mapping_iterator;
  * counterpart.
  */
 enum ctf_type_id {
-       CTF_TYPE_UNKNOWN = 0,
-       CTF_TYPE_INTEGER,
-       CTF_TYPE_FLOAT,
-       CTF_TYPE_ENUM,
-       CTF_TYPE_STRING,
-       CTF_TYPE_STRUCT,
-       CTF_TYPE_UNTAGGED_VARIANT,
-       CTF_TYPE_VARIANT,
-       CTF_TYPE_ARRAY,
-       CTF_TYPE_SEQUENCE,
+       CTF_TYPE_UNKNOWN = -1,
+       CTF_TYPE_INTEGER = 0,
+       CTF_TYPE_FLOAT = 1,
+       CTF_TYPE_ENUM = 2,
+       CTF_TYPE_STRING = 3,
+       CTF_TYPE_STRUCT = 4,
+       CTF_TYPE_UNTAGGED_VARIANT = 5,
+       CTF_TYPE_VARIANT = 5,
+       CTF_TYPE_ARRAY = 6,
+       CTF_TYPE_SEQUENCE = 7,
        NR_CTF_TYPES,
 };
 
@@ -294,10 +294,6 @@ enum bt_ctf_field_type_id {
        /// \ref ctfirstructfieldtype
        BT_CTF_FIELD_TYPE_ID_STRUCT = CTF_TYPE_STRUCT,
 
-       /// @cond DOCUMENT
-       BT_CTF_TYPE_ID_UNTAGGED_VARIANT = CTF_TYPE_UNTAGGED_VARIANT,
-       /// @endcond
-
        /// \ref ctfirarrayfieldtype
        BT_CTF_FIELD_TYPE_ID_ARRAY = CTF_TYPE_ARRAY,
 

diff --git a/plugins/libctfcopytrace/clock-fields.c b/plugins/libctfcopytrace/clock-fields.c
index f24206a27fb8023f9a279480c2cc27f6fef58a48..300540216019ccdd7a046d818bfff30f41bc1b6f 100644 (file)
--- a/plugins/libctfcopytrace/clock-fields.c
+++ b/plugins/libctfcopytrace/clock-fields.c
@@ -136,7 +136,6 @@ int find_update_clock_fields(FILE *err, struct bt_ctf_field_type *type,
        case BT_CTF_FIELD_TYPE_ID_SEQUENCE:
                return find_update_sequence_clock_fields(err, type,
                                writer_clock_class);
-       case BT_CTF_TYPE_ID_UNTAGGED_VARIANT:
        case BT_CTF_FIELD_TYPE_ID_VARIANT:
                return find_update_variant_clock_fields(err, type,
                                writer_clock_class);
@@ -466,7 +465,6 @@ int copy_override_field(FILE *err, struct bt_ctf_event *event,
                ret = copy_find_clock_sequence_field(err, event, writer_event,
                                field, type, copy_field);
                break;
-       case BT_CTF_TYPE_ID_UNTAGGED_VARIANT:
        case BT_CTF_FIELD_TYPE_ID_VARIANT:
                ret = copy_find_clock_variant_field(err, event, writer_event,
                                field, type, copy_field);

diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c
index 9a8d002c706851de96ec3b0c5bce25ef0b7d6021..3615cfd07ecf1597a5c406f6b66f66fd467ca885 100644 (file)
--- a/plugins/text/pretty/print.c
+++ b/plugins/text/pretty/print.c
@@ -1311,7 +1311,6 @@ enum bt_component_status print_field(struct pretty_component *pretty,
        case CTF_TYPE_STRUCT:
                return print_struct(pretty, field, print_names, filter_fields,
                                filter_array_len);
-       case CTF_TYPE_UNTAGGED_VARIANT:
        case CTF_TYPE_VARIANT:
                return print_variant(pretty, field, print_names);
        case CTF_TYPE_ARRAY: