lib: rename include dir to babeltrace2

[babeltrace.git] / plugins / ctf / common / metadata / ctf-meta-update-text-array-sequence.c

diff --git a/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c b/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c
index 1253f4a55ded2d4e0b5a3d042d95d933174a11b3..29d231f07e182c2ff06ca41e0f39ab8daa9f0f2a 100644 (file)
--- a/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c
+++ b/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c
@@ -15,9 +15,9 @@
 #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-TEXT-ARRAY-SEQ"
 #include "logging.h"
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
@@ -35,8 +35,8 @@ int set_text_array_sequence_field_class(struct ctf_field_class *fc)
                goto end;
        }
 
-       switch (fc->id) {
-       case CTF_FIELD_CLASS_ID_STRUCT:
+       switch (fc->type) {
+       case CTF_FIELD_CLASS_TYPE_STRUCT:
        {
                struct ctf_field_class_struct *struct_fc = (void *) fc;
 
@@ -53,7 +53,7 @@ int set_text_array_sequence_field_class(struct ctf_field_class *fc)
 
                break;
        }
-       case CTF_FIELD_CLASS_ID_VARIANT:
+       case CTF_FIELD_CLASS_TYPE_VARIANT:
        {
                struct ctf_field_class_variant *var_fc = (void *) fc;
 
@@ -70,13 +70,13 @@ int set_text_array_sequence_field_class(struct ctf_field_class *fc)
 
                break;
        }
-       case CTF_FIELD_CLASS_ID_ARRAY:
-       case CTF_FIELD_CLASS_ID_SEQUENCE:
+       case CTF_FIELD_CLASS_TYPE_ARRAY:
+       case CTF_FIELD_CLASS_TYPE_SEQUENCE:
        {
                struct ctf_field_class_array_base *array_fc = (void *) fc;
 
-               if (array_fc->elem_fc->id == CTF_FIELD_CLASS_ID_INT ||
-                               array_fc->elem_fc->id == CTF_FIELD_CLASS_ID_ENUM) {
+               if (array_fc->elem_fc->type == CTF_FIELD_CLASS_TYPE_INT ||
+                               array_fc->elem_fc->type == CTF_FIELD_CLASS_TYPE_ENUM) {
                        struct ctf_field_class_int *int_fc =
                                (void *) array_fc->elem_fc;