X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-metadata-field-class-copy.c;h=1247e598cbc247fa43f6a7dc7f27fc5e6991fbaf;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=a256beda74e49c7fe9920cef05a2892ed718fb47;hpb=8f3ccfbc98c03ee07895d9d2e50e6390bbbb0431;p=babeltrace.git

diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
index a256beda..1247e598 100644
--- a/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
+++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
@@ -27,10 +27,10 @@
 #define BT_LOG_TAG "PLUGIN-LTTNG-UTILS-DEBUG-INFO-TRACE-IR-METADATA-FC-COPY"
 #include "logging.h"
 
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "trace-ir-metadata-copy.h"
 #include "trace-ir-metadata-field-class-copy.h"
@@ -299,7 +299,7 @@ int field_class_signed_enumeration_copy(
 					i_mapping, range_index, &lower, &upper);
 
 			BT_LOGD("Copying range in enumeration field class: "
-					"label=%s, lower=%ld, upper=%ld",
+					"label=%s, lower=%"PRId64", upper=%"PRId64,
 					label, lower, upper);
 
 			/* Add the label and its range to the copy field class. */
@@ -418,7 +418,7 @@ int field_class_variant_copy(
 		const bt_field_class *in_field_class,
 		bt_field_class *out_field_class)
 {
-	bt_field_class *out_tag_field_class;
+	bt_field_class *out_tag_field_class = NULL;
 	uint64_t i, variant_option_count;
 	const bt_field_path *tag_fp;
 	const bt_field_class *tag_fc;