X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Ffs-sink-trace.c;h=400b21d7e7a4ff625aca44605cf31861c93a88b9;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=f01787747f60215dedb3d4ed7af70b0de7ca7e63;hpb=fdd3a2da18afef5ca32ba181a8b6ebbff173df02;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/fs-sink-trace.c b/plugins/ctf/fs-sink/fs-sink-trace.c
index f0178774..400b21d7 100644
--- a/plugins/ctf/fs-sink/fs-sink-trace.c
+++ b/plugins/ctf/fs-sink/fs-sink-trace.c
@@ -23,12 +23,12 @@
 #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRACE"
 #include "logging.h"
 
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/babeltrace.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/ctfser-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/ctfser-internal.h>
 
 #include "translate-trace-ir-to-ctf-ir.h"
 #include "translate-ctf-ir-to-tsdl.h"
@@ -489,6 +489,8 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace)
 	tsdl = g_string_new(NULL);
 	BT_ASSERT(tsdl);
 	translate_trace_class_ctf_ir_to_tsdl(trace->tc, tsdl);
+
+	BT_ASSERT(trace->metadata_path);
 	fh = fopen(trace->metadata_path->str, "wb");
 	if (!fh) {
 		BT_LOGF_ERRNO("In trace destruction listener: "
@@ -514,10 +516,8 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace)
 		trace->path = NULL;
 	}
 
-	if (trace->metadata_path) {
-		g_string_free(trace->metadata_path, TRUE);
-		trace->metadata_path = NULL;
-	}
+	g_string_free(trace->metadata_path, TRUE);
+	trace->metadata_path = NULL;
 
 	fs_sink_ctf_trace_class_destroy(trace->tc);
 	trace->tc = NULL;