X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fdecoder.c;h=c39e79e36ec9ad4c5d58bcaa7f44a060ee54b702;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=4b4e634db5192c396f98e1aabb3c7a45a44a7efb;hpb=862ca4ed7b3a8ef14f69529d252bccc48a33108a;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index 4b4e634d..c39e79e3 100644
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -20,10 +20,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/compat/memstream-internal.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/compat/memstream-internal.h>
+#include <babeltrace2/babeltrace.h>
 #include <glib.h>
 #include <string.h>
 
@@ -348,6 +348,7 @@ int ctf_metadata_decoder_packetized_file_stream_to_buf(
 
 BT_HIDDEN
 struct ctf_metadata_decoder *ctf_metadata_decoder_create(
+		bt_self_component_source *self_comp,
 		const struct ctf_metadata_decoder_config *config)
 {
 	struct ctf_metadata_decoder *mdec =
@@ -372,7 +373,7 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 	}
 
 	mdec->config = *config;
-	mdec->visitor = ctf_visitor_generate_ir_create(config);
+	mdec->visitor = ctf_visitor_generate_ir_create(self_comp, config);
 	if (!mdec->visitor) {
 		BT_LOGE("Failed to create a CTF IR metadata AST visitor: "
 			"mdec-addr=%p", mdec);
@@ -511,10 +512,6 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
 
 	ret = ctf_visitor_generate_ir_visit_node(mdec->visitor,
 		&scanner->ast->root);
-	// TODO
-	ret = -1;
-	goto end;
-
 	switch (ret) {
 	case 0:
 		/* Success */
@@ -553,7 +550,7 @@ end:
 }
 
 BT_HIDDEN
-struct bt_trace_class *ctf_metadata_decoder_get_ir_trace_class(
+bt_trace_class *ctf_metadata_decoder_get_ir_trace_class(
 		struct ctf_metadata_decoder *mdec)
 {
 	return ctf_visitor_generate_ir_get_ir_trace_class(mdec->visitor);