Refactoring: struct lttng_channel_ops

[lttng-ust.git] / liblttng-ust / lttng-events.c

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 7dfe6b7a6d46a5a6fa62eaffa5f72a8f37aae665..762395d657330b0aca25959661d8d2ebe587bb53 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -398,7 +398,7 @@ void lttng_enabler_destroy(struct lttng_enabler *enabler)
 }
 
 static
-int lttng_enum_create(const struct lttng_enum_desc *desc,
+int lttng_enum_create(const struct lttng_ust_enum_desc *desc,
                struct lttng_session *session)
 {
        const char *enum_name = desc->name;
@@ -462,7 +462,7 @@ int lttng_create_enum_check(const struct lttng_type *type,
        switch (type->atype) {
        case atype_enum_nestable:
        {
-               const struct lttng_enum_desc *enum_desc;
+               const struct lttng_ust_enum_desc *enum_desc;
                int ret;
 
                enum_desc = type->u.enum_nestable.desc;
@@ -475,8 +475,8 @@ int lttng_create_enum_check(const struct lttng_type *type,
        }
        case atype_dynamic:
        {
-               const struct lttng_event_field *tag_field_generic;
-               const struct lttng_enum_desc *enum_desc;
+               const struct lttng_ust_event_field *tag_field_generic;
+               const struct lttng_ust_enum_desc *enum_desc;
                int ret;
 
                tag_field_generic = lttng_ust_dynamic_type_tag_field();
@@ -497,7 +497,7 @@ int lttng_create_enum_check(const struct lttng_type *type,
 
 static
 int lttng_create_all_event_enums(size_t nr_fields,
-               const struct lttng_event_field *event_fields,
+               const struct lttng_ust_event_field **event_fields,
                struct lttng_session *session)
 {
        size_t i;
@@ -505,7 +505,7 @@ int lttng_create_all_event_enums(size_t nr_fields,
 
        /* For each field, ensure enum is part of the session. */
        for (i = 0; i < nr_fields; i++) {
-               const struct lttng_type *type = &event_fields[i].type;
+               const struct lttng_type *type = &event_fields[i]->type;
 
                ret = lttng_create_enum_check(type, session);
                if (ret)
@@ -1140,11 +1140,11 @@ void _event_enum_destroy(struct lttng_ust_event_common *event)
 
                /* Destroy enums of the current event. */
                for (i = 0; i < event_recorder->parent->priv->desc->nr_fields; i++) {
-                       const struct lttng_enum_desc *enum_desc;
-                       const struct lttng_event_field *field;
+                       const struct lttng_ust_enum_desc *enum_desc;
+                       const struct lttng_ust_event_field *field;
                        struct lttng_enum *curr_enum;
 
-                       field = &(event_recorder->parent->priv->desc->fields[i]);
+                       field = event_recorder->parent->priv->desc->fields[i];
                        switch (field->type.atype) {
                        case atype_enum_nestable:
                                enum_desc = field->type.u.enum_nestable.desc;