Coding standard clean-ups

[babeltrace.git] / plugins / ctf / common / notif-iter / notif-iter.c

diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c
index 9c6134f9422317e8a77d82240ce1ef854bf0f588..f29b72eeee7f5ad87e968549f131b1705be70990 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -578,9 +578,7 @@ enum bt_ctf_notif_iter_status set_current_stream_class(struct bt_ctf_notif_iter
        }
 
        BT_PUT(notit->meta.stream_class);
-
-       // TODO: get by ID
-       notit->meta.stream_class = bt_ctf_trace_get_stream_class(
+       notit->meta.stream_class = bt_ctf_trace_get_stream_class_by_id(
                        notit->meta.trace, stream_id);
        if (!notit->meta.stream_class) {
                PERR("Cannot find stream class with ID %" PRIu64 "\n",
@@ -890,12 +888,6 @@ enum bt_ctf_notif_iter_status after_event_header_state(
 {
        enum bt_ctf_notif_iter_status status;
 
-       status = set_current_packet_content_sizes(notit);
-       if (status != BT_CTF_NOTIF_ITER_STATUS_OK) {
-               PERR("Failed to set current packet and content sizes\n");
-               goto end;
-       }
-
        status = set_current_event_class(notit);
        if (status != BT_CTF_NOTIF_ITER_STATUS_OK) {
                PERR("Failed to set current event class\n");
@@ -1639,6 +1631,7 @@ struct bt_ctf_field_type *btr_get_variant_type_cb(
 end:
        BT_PUT(tag_field);
        BT_PUT(selected_field);
+       BT_PUT(path);
 
        return selected_field_type;
 }
@@ -1850,8 +1843,7 @@ struct bt_ctf_notif_iter *bt_ctf_notif_iter_create(struct bt_ctf_trace *trace,
                goto end;
        }
 
-       notit->meta.trace = trace;
-       bt_get(notit->meta.trace);
+       notit->meta.trace = bt_get(trace);
        notit->medium.medops = medops;
        notit->medium.max_request_sz = max_request_sz;
        notit->medium.data = data;