Cleanup: move type_id initialization after byte order check

[babeltrace.git] / formats / ctf / ir / event-types.c

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index 5c091bc76896c210883487dff71b810ba7929995..a4dca127eb0c7c0b39280f3e2984cb4dd3928e52 100644 (file)
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -382,6 +382,27 @@ int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
                ret = enumeration->entries->len ? 0 : -1;
                break;
        }
+       case CTF_TYPE_SEQUENCE:
+       {
+               struct bt_ctf_field_type_sequence *sequence =
+                       container_of(type, struct bt_ctf_field_type_sequence,
+                       parent);
+
+               /* length field name should be set at this point */
+               ret = sequence->length_field_name->len ? 0 : -1;
+               break;
+       }
+       case CTF_TYPE_VARIANT:
+       {
+               struct bt_ctf_field_type_variant *variant =
+                       container_of(type, struct bt_ctf_field_type_variant,
+                               parent);
+
+               if (variant->tag_name->len == 0 || !variant->tag) {
+                       ret = -1;
+               }
+               break;
+       }
        default:
                break;
        }
@@ -1742,7 +1763,6 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
                goto end;
        }
 
-       type_id = type->declaration->id;
        switch (byte_order) {
        case BT_CTF_BYTE_ORDER_NATIVE:
                /* Leave unset. Will be initialized by parent. */
@@ -1760,6 +1780,7 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
                goto end;
        }
 
+       type_id = type->declaration->id;
        if (set_byte_order_funcs[type_id]) {
                set_byte_order_funcs[type_id](type, internal_byte_order, 0);
        }