X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta-update-meanings.c;h=cadbdeae3f459964e5daa6e5d5d5e4caee76c333;hb=864cad701843d041ae0c9113fc2c20f9b3e1835d;hp=1e2bb1ae9ae8fddc2cbd4cbd4aba599fcfb67a54;hpb=5cd6d0e5fa67c2bdd21dc153313618260595d7bc;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/ctf-meta-update-meanings.c b/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
index 1e2bb1ae..cadbdeae 100644
--- a/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
+++ b/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
@@ -37,9 +37,9 @@ int set_int_field_class_meaning_by_name(struct ctf_field_class *fc,
 		goto end;
 	}
 
-	switch (fc->id) {
-	case CTF_FIELD_CLASS_ID_INT:
-	case CTF_FIELD_CLASS_ID_ENUM:
+	switch (fc->type) {
+	case CTF_FIELD_CLASS_TYPE_INT:
+	case CTF_FIELD_CLASS_TYPE_ENUM:
 	{
 		struct ctf_field_class_int *int_fc = (void *) fc;
 
@@ -49,7 +49,7 @@ int set_int_field_class_meaning_by_name(struct ctf_field_class *fc,
 
 		break;
 	}
-	case CTF_FIELD_CLASS_ID_STRUCT:
+	case CTF_FIELD_CLASS_TYPE_STRUCT:
 	{
 		struct ctf_field_class_struct *struct_fc = (void *) fc;
 
@@ -67,7 +67,7 @@ int set_int_field_class_meaning_by_name(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;
 
@@ -85,8 +85,8 @@ int set_int_field_class_meaning_by_name(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;
 
@@ -207,7 +207,7 @@ int ctf_trace_class_update_meanings(struct ctf_trace_class *ctf_tc)
 
 		named_fc = ctf_field_class_struct_borrow_member_by_name(
 			(void *) ctf_tc->packet_header_fc, "uuid");
-		if (named_fc && named_fc->fc->id == CTF_FIELD_CLASS_ID_ARRAY) {
+		if (named_fc && named_fc->fc->type == CTF_FIELD_CLASS_TYPE_ARRAY) {
 			struct ctf_field_class_array *array_fc =
 				(void *) named_fc->fc;