Rename correlator to muxer

[babeltrace.git] / plugins / ctf / fs / fs.c

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index bcaf4d5ab6df61d02774045b9ae76cd624705e6f..b80e4e152095c4e3ed19a0abf80b72dc2fe3974b 100644 (file)
--- a/plugins/ctf/fs/fs.c
+++ b/plugins/ctf/fs/fs.c
@@ -57,6 +57,7 @@ struct bt_notification *ctf_fs_iterator_get(
 
        notification = bt_get(ctf_fs->current_notification);
 end:
+       BT_PUT(component);
        return notification;
 }
 
@@ -65,8 +66,7 @@ enum bt_notification_iterator_status ctf_fs_iterator_next(
                struct bt_notification_iterator *iterator)
 {
        enum bt_notification_iterator_status ret;
-       struct bt_ctf_notif_iter_notif *notification;
-//     struct bt_notification *notification = NULL;
+       struct bt_notification *notification = NULL;
        struct ctf_fs_component *ctf_fs;
        struct bt_component *component = bt_notification_iterator_get_component(
                        iterator);
@@ -84,30 +84,10 @@ enum bt_notification_iterator_status ctf_fs_iterator_next(
                goto end;
        }
 
-       switch (notification->type) {
-       case BT_CTF_NOTIF_ITER_NOTIF_NEW_PACKET:
-       {
-               struct bt_ctf_notif_iter_notif_new_packet *notif =
-                       (struct bt_ctf_notif_iter_notif_new_packet *) notification;
-               break;
-       }
-       case BT_CTF_NOTIF_ITER_NOTIF_EVENT:
-       {
-               struct bt_ctf_notif_iter_notif_event *notif =
-                       (struct bt_ctf_notif_iter_notif_event *) notification;
-               break;
-       }
-       case BT_CTF_NOTIF_ITER_NOTIF_END_OF_PACKET:
-       {
-               struct bt_ctf_notif_iter_notif_end_of_packet *notif =
-                       (struct bt_ctf_notif_iter_notif_end_of_packet *) notification;
-               break;
-       }
-       default:
-               break;
-       }
-
+       bt_put(ctf_fs->current_notification);
+       ctf_fs->current_notification = notification;
 end:
+       BT_PUT(component);
        return ret;
 }
 
@@ -261,7 +241,6 @@ enum bt_component_status ctf_fs_init(struct bt_component *source,
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
        }
-
 end:
        return ret;
 error: