Fix: sink.ctf.fs: fix logic of make_unique_stream_file_name

[babeltrace.git] / src / plugins / ctf / fs-sink / fs-sink-stream.c

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index 64aecd47ad02f1515d9430dc93d5aa55327e22e4..16d7eb38e98c0829c6829b5186dc9745c96d3add 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -120,7 +120,7 @@ GString *make_unique_stream_file_name(struct fs_sink_trace *trace,
 
        BT_ASSERT(name);
 
-       while (stream_file_name_exists(trace, name->str) &&
+       while (stream_file_name_exists(trace, name->str) ||
                        strcmp(name->str, "metadata") == 0) {
                g_string_printf(name, "%s-%u", san_base->str, suffix);
                suffix++;
@@ -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;