X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fnotif-iter%2Fnotif-iter.c;h=496f95a4222ebdc2e977d0fab866733e4ae3e0b4;hb=dc77b5215ef41c67486cf32bce85bfde0b415952;hp=be79603e672525b5f251c203f182040aa5840675;hpb=53a1cae7cefe4497f219c13971bfb85218c6d559;p=babeltrace.git diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c index be79603e..496f95a4 100644 --- a/plugins/ctf/common/notif-iter/notif-iter.c +++ b/plugins/ctf/common/notif-iter/notif-iter.c @@ -361,7 +361,7 @@ static inline enum bt_ctf_notif_iter_status notif_iter_status_from_m_status( enum bt_ctf_notif_iter_medium_status m_status) { - return m_status; + return (int) m_status; } static inline @@ -382,38 +382,12 @@ size_t packet_at(struct bt_ctf_notif_iter *notit) return notit->buf.packet_offset + notit->buf.at; } -static inline -size_t remaining_content_bits(struct bt_ctf_notif_iter *notit) -{ - if (notit->cur_content_size == -1) { - return -1; - } - - return notit->cur_content_size - packet_at(notit); -} - -static inline -size_t remaining_packet_bits(struct bt_ctf_notif_iter *notit) -{ - if (notit->cur_packet_size == -1) { - return -1; - } - - return notit->cur_packet_size - packet_at(notit); -} - static inline void buf_consume_bits(struct bt_ctf_notif_iter *notit, size_t incr) { notit->buf.at += incr; } -static inline -bool buf_has_enough_bits(struct bt_ctf_notif_iter *notit, size_t sz) -{ - return buf_available_bits(notit) >= sz; -} - static enum bt_ctf_notif_iter_status request_medium_bytes( struct bt_ctf_notif_iter *notit) @@ -2211,30 +2185,6 @@ end: BT_PUT(event); } -//FIXME: not used ? -static -void notify_eos(struct bt_ctf_notif_iter *notit, - struct bt_notification **notification) -{ - struct bt_ctf_stream *stream = NULL; - struct bt_notification *ret = NULL; - - /* Ask the user for the stream */ - stream = notit->medium.medops.get_stream(notit->meta.stream_class, - notit->medium.data); - if (!stream) { - goto end; - } - - ret = bt_notification_stream_end_create(stream); - if (!ret) { - goto end; - } - *notification = ret; -end: - BT_PUT(stream); -} - static int init_clock_states(GHashTable *clock_states, struct bt_ctf_trace *trace) {