Cleanup: remove unused bt_ctf_stream_set_trace function

[babeltrace.git] / formats / ctf / ir / stream.c

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index a903264963572ecc89279cb4b8f14781687ce909..e89b1fcf6b62f669b6c67d3b953369f13b9441df 100644 (file)
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -246,6 +246,13 @@ end:
        return ret;
 }
 
+static
+void put_event(struct bt_ctf_event *event)
+{
+       bt_ctf_event_set_stream(event, NULL);
+       bt_ctf_event_put(event);
+}
+
 BT_HIDDEN
 struct bt_ctf_stream *bt_ctf_stream_create(
        struct bt_ctf_stream_class *stream_class,
@@ -297,7 +304,7 @@ struct bt_ctf_stream *bt_ctf_stream_create(
        stream->stream_class = stream_class;
        bt_ctf_stream_class_get(stream_class);
        stream->events = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) bt_ctf_event_put);
+               (GDestroyNotify) put_event);
        if (!stream->events) {
                goto error_destroy;
        }
@@ -312,6 +319,9 @@ struct bt_ctf_stream *bt_ctf_stream_create(
        /* A trace is not allowed to have a NULL packet header */
        assert(trace->packet_header_type);
        stream->packet_header = bt_ctf_field_create(trace->packet_header_type);
+       if (!stream->packet_header) {
+               goto error_destroy;
+       }
        /*
         * Attempt to populate the default trace packet header fields
         * (magic, uuid and stream_id). This will _not_ fail shall the
@@ -347,13 +357,6 @@ end:
        return ret;
 }
 
-BT_HIDDEN
-void bt_ctf_stream_set_trace(struct bt_ctf_stream *stream,
-               struct bt_ctf_trace *trace)
-{
-       stream->trace = trace;
-}
-
 struct bt_ctf_stream_class *bt_ctf_stream_get_class(
                struct bt_ctf_stream *stream)
 {
@@ -507,6 +510,13 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
                goto end;
        }
 
+       ret = bt_ctf_event_set_stream(event, stream);
+       if (ret) {
+               /* Event was already associated to a stream */
+               ret = -1;
+               goto end;
+       }
+
        ret = bt_ctf_event_populate_event_header(event);
        if (ret) {
                goto end;
@@ -540,6 +550,9 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
                g_ptr_array_add(stream->event_contexts, event_context_copy);
        }
 end:
+       if (ret) {
+               (void) bt_ctf_event_set_stream(event, NULL);
+       }
        return ret;
 }
 
@@ -910,7 +923,7 @@ void bt_ctf_stream_destroy(struct bt_ctf_ref *ref)
 
        stream = container_of(ref, struct bt_ctf_stream, ref_count);
        ctf_fini_pos(&stream->pos);
-       if (close(stream->pos.fd)) {
+       if (stream->pos.fd >= 0 && close(stream->pos.fd)) {
                perror("close");
        }