X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink-stream.c;h=93807d749a07906c5ee7cd476cad5dc614bb3cbd;hb=7b4311c13e6c335ae193fafed8060ef5bcec635e;hp=ca61d10ff1c9bbee4cc450bf64178438c06af54a;hpb=fe4df857056b4a03898f1031f136359ce733b0f5;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index ca61d10f..93807d74 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -391,7 +391,7 @@ int write_variant_field(struct fs_sink_stream *stream,
 		const bt_field *field)
 {
 	uint64_t opt_index =
-		bt_field_variant_get_selected_option_field_index(field);
+		bt_field_variant_get_selected_option_index(field);
 	int ret;
 
 	if (fc->tag_is_before) {
@@ -449,7 +449,7 @@ int write_field(struct fs_sink_stream *stream,
 		ret = write_variant_field(stream, (void *) fc, field);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	return ret;
@@ -470,7 +470,7 @@ int write_event_header(struct fs_sink_stream *stream,
 
 	/* Time */
 	if (stream->sc->default_clock_class) {
-		BT_ASSERT(cs);
+		BT_ASSERT_DBG(cs);
 		ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
 			bt_clock_snapshot_get_value(cs), 8, 64, BYTE_ORDER);
 		if (G_UNLIKELY(ret)) {
@@ -499,7 +499,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
 	/* Common context */
 	if (stream->sc->event_common_context_fc) {
 		field = bt_event_borrow_common_context_field_const(event);
-		BT_ASSERT(field);
+		BT_ASSERT_DBG(field);
 		ret = write_struct_field(stream,
 			(void *) stream->sc->event_common_context_fc,
 			field, true);
@@ -511,7 +511,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
 	/* Specific context */
 	if (ec->spec_context_fc) {
 		field = bt_event_borrow_specific_context_field_const(event);
-		BT_ASSERT(field);
+		BT_ASSERT_DBG(field);
 		ret = write_struct_field(stream, (void *) ec->spec_context_fc,
 			field, true);
 		if (G_UNLIKELY(ret)) {
@@ -522,7 +522,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
 	/* Specific context */
 	if (ec->payload_fc) {
 		field = bt_event_borrow_payload_field_const(event);
-		BT_ASSERT(field);
+		BT_ASSERT_DBG(field);
 		ret = write_struct_field(stream, (void *) ec->payload_fc,
 			field, true);
 		if (G_UNLIKELY(ret)) {