X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fresolve.c;h=4bc4130f96856b0018e91e449038430618df963e;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=c9a56b79c56afa338034434ad9f88e19da559cb7;hpb=46df6b28f5437bb7c69bede3b09758c45d9440fd;p=babeltrace.git

diff --git a/formats/ctf/ir/resolve.c b/formats/ctf/ir/resolve.c
index c9a56b79..4bc4130f 100644
--- a/formats/ctf/ir/resolve.c
+++ b/formats/ctf/ir/resolve.c
@@ -31,7 +31,7 @@
 #include <babeltrace/ctf-ir/event.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/resolve-internal.h>
-#include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/ctf-ir/field-types.h>
 #include <babeltrace/ctf-ir/field-path.h>
 #include <babeltrace/ctf-ir/field-path-internal.h>
 #include <babeltrace/ctf-ir/event-internal.h>
@@ -927,6 +927,8 @@ int resolve_sequence_or_variant_type(struct bt_ctf_field_type *type,
 		break;
 	default:
 		assert(false);
+		ret = -1;
+		goto end;
 	}
 
 	/* Get target field path out of path string */
@@ -1085,7 +1087,7 @@ end:
  * Resolves the root field type corresponding to the scope `root_scope`.
  */
 static
-int resolve_root_type(enum ctf_type_id root_scope, struct resolve_context *ctx)
+int resolve_root_type(enum bt_ctf_scope root_scope, struct resolve_context *ctx)
 {
 	int ret;