Remove superflous set_current_packet_content_sizes

[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 b9c450b48e960f710b50ae640dadf59ca7da6015..ab28630ef12fc37307b054d9fef9c76a4c346d4a 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -169,10 +169,10 @@ struct bt_ctf_notif_iter {
        } medium;
 
        /* Current packet size (bits) (-1 if unknown) */
-       size_t cur_packet_size;
+       int64_t cur_packet_size;
 
        /* Current content size (bits) (-1 if unknown) */
-       size_t cur_content_size;
+       int64_t cur_content_size;
 };
 
 static
@@ -579,8 +579,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 +889,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");