X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=20b60cce70792475e78af132c3c4fee0e549f2c1;hb=f30762e5afa0e61a609d2d7efe1d36264cf7acfa;hp=6588c13b19b55d44e81a94868c9c83d77f54156e;hpb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index 6588c13b..20b60cce 100644
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -648,7 +648,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 
 	ds_file->log_level = log_level;
 	ds_file->self_comp = ctf_fs_trace->self_comp;
-	ds_file->pc_msg_iter = pc_msg_iter;
+	ds_file->self_msg_iter = pc_msg_iter;
 	ds_file->file = ctf_fs_file_create(log_level, ds_file->self_comp);
 	if (!ds_file->file) {
 		goto error;
@@ -755,7 +755,7 @@ bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next(
 	bt_component_class_message_iterator_next_method_status status;
 
 	msg_iter_status = bt_msg_iter_get_next_message(
-		ds_file->msg_iter, ds_file->pc_msg_iter, msg);
+		ds_file->msg_iter, ds_file->self_msg_iter, msg);
 
 	switch (msg_iter_status) {
 	case BT_MSG_ITER_STATUS_EOF:
@@ -770,7 +770,7 @@ bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next(
 		 * medium-specific; there is nothing for the user to do
 		 * and it should have been handled upstream.
 		 */
-		abort();
+		bt_common_abort();
 	case BT_MSG_ITER_STATUS_INVAL:
 	case BT_MSG_ITER_STATUS_ERROR:
 	default: