Fix: event, stream names can be strings

[babeltrace.git] / lib / ctf-ir / event-class.c

diff --git a/lib/ctf-ir/event-class.c b/lib/ctf-ir/event-class.c
index f1859d347cbb58f9b639b141481c2d2358c2a6d1..67cb1575ec054b4e05a797c2dacf7bba16e7ce23 100644 (file)
--- a/lib/ctf-ir/event-class.c
+++ b/lib/ctf-ir/event-class.c
@@ -45,6 +45,7 @@
 #include <babeltrace/types.h>
 #include <babeltrace/values-internal.h>
 #include <inttypes.h>
+#include <stdlib.h>
 
 static
 void bt_ctf_event_class_destroy(struct bt_object *obj);
@@ -58,12 +59,6 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
        BT_LOGD("Creating event class object: name=\"%s\"",
                name);
 
-       if (bt_ctf_validate_identifier(name)) {
-               BT_LOGW("Invalid parameter: event class's name is not a valid CTF identifier: "
-                       "name=\"%s\"", name);
-               goto error;
-       }
-
        event_class = g_new0(struct bt_ctf_event_class, 1);
        if (!event_class) {
                BT_LOGE_STR("Failed to allocate one event class.");
@@ -78,12 +73,6 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
                goto error;
        }
 
-       event_class->context = bt_ctf_field_type_structure_create();
-       if (!event_class->context) {
-               BT_LOGE_STR("Cannot create event class's initial context field type object.");
-               goto error;
-       }
-
        event_class->attributes = bt_ctf_attributes_create();
        if (!event_class->attributes) {
                BT_LOGE_STR("Cannot create event class's attributes object.");
@@ -789,9 +778,9 @@ void bt_ctf_event_class_destroy(struct bt_object *obj)
                bt_ctf_event_class_get_id(event_class));
        BT_LOGD_STR("Destroying event class's attributes.");
        bt_ctf_attributes_destroy(event_class->attributes);
-       BT_LOGD_STR("Putting event class's context field type.");
+       BT_LOGD_STR("Putting context field type.");
        bt_put(event_class->context);
-       BT_LOGD_STR("Putting event class's payload field type.");
+       BT_LOGD_STR("Putting payload field type.");
        bt_put(event_class->fields);
        g_free(event_class);
 }
@@ -876,7 +865,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 
                default:
                        /* should never happen */
-                       assert(BT_FALSE);
+                       abort();
                        break;
                }