X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwrite.c;h=4b6f6e9ac2e28553afee26b8d4961ad648ba13c6;hb=2c7bce29719234758323f09acfbb8c50dce701a7;hp=21938e6ff855849ac7035c602efac532b1345720;hpb=8893a28c00914a38f11b6bf4822224a218bfc4b3;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index 21938e6f..4b6f6e9a 100644
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -66,10 +66,13 @@ gboolean empty_ht(gpointer key, gpointer value, gpointer user_data)
 static
 gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
 {
+	int ret;
 	struct bt_ctf_stream *writer_stream = value;
 
-	bt_ctf_stream_flush(writer_stream);
-
+	ret = bt_ctf_stream_flush(writer_stream);
+	if (ret) {
+		BT_LOGD_STR("Failed to flush stream while emptying hash table.");
+	}
 	return TRUE;
 }
 
@@ -245,7 +248,7 @@ int make_trace_path(struct writer_component *writer_component,
 
 	}
 
-	snprintf(trace_path, PATH_MAX, "%s/%s",
+	snprintf(trace_path, PATH_MAX, "%s" G_DIR_SEPARATOR_S "%s",
 			writer_component->base_path->str,
 			trace_name);
 	/*
@@ -262,7 +265,7 @@ int make_trace_path(struct writer_component *writer_component,
 			int i = 0;
 
 			do {
-				snprintf(trace_path, PATH_MAX, "%s/%s-%d",
+				snprintf(trace_path, PATH_MAX, "%s" G_DIR_SEPARATOR_S "%s-%d",
 						writer_component->base_path->str,
 						trace_name, ++i);
 			} while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX);
@@ -357,7 +360,7 @@ struct fs_writer *insert_new_writer(
 		fs_writer->static_listener_id = -1;
 	} else {
 		ret = bt_ctf_trace_add_is_static_listener(trace,
-				trace_is_static_listener, fs_writer);
+				trace_is_static_listener, NULL, fs_writer);
 		assert(ret >= 0);
 		fs_writer->static_listener_id = ret;
 	}