lib: add aliases for Babeltrace structure types

[babeltrace.git] / plugins / utils / counter / counter.c

diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index 7b82ae4a84e084229e9bd2eb081d6fdc37f0793b..5506e5800e896f3bb246a08b1fa4db9015108c22 100644 (file)
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -103,12 +103,12 @@ void try_print_last(struct counter *counter)
 
 void destroy_private_counter_data(struct counter *counter)
 {
-       bt_object_put_ref(counter->notif_iter);
+       bt_self_component_port_input_notification_iterator_put_ref(counter->notif_iter);
        g_free(counter);
 }
 
 BT_HIDDEN
-void counter_finalize(struct bt_self_component_sink *comp)
+void counter_finalize(bt_self_component_sink *comp)
 {
        struct counter *counter;
 
@@ -117,20 +117,20 @@ void counter_finalize(struct bt_self_component_sink *comp)
                        bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(counter);
        try_print_last(counter);
-       bt_object_put_ref(counter->notif_iter);
+       bt_self_component_port_input_notification_iterator_put_ref(counter->notif_iter);
        g_free(counter);
 }
 
 BT_HIDDEN
 enum bt_self_component_status counter_init(
-               struct bt_self_component_sink *component,
-               const struct bt_value *params,
+               bt_self_component_sink *component,
+               const bt_value *params,
                UNUSED_VAR void *init_method_data)
 {
        enum bt_self_component_status ret;
        struct counter *counter = g_new0(struct counter, 1);
-       const struct bt_value *step = NULL;
-       const struct bt_value *hide_zero = NULL;
+       const bt_value *step = NULL;
+       const bt_value *hide_zero = NULL;
 
        if (!counter) {
                ret = BT_SELF_COMPONENT_STATUS_NOMEM;
@@ -177,13 +177,13 @@ end:
 
 BT_HIDDEN
 enum bt_self_component_status counter_port_connected(
-               struct bt_self_component_sink *comp,
-               struct bt_self_component_port_input *self_port,
-               struct bt_port_output *other_port)
+               bt_self_component_sink *comp,
+               bt_self_component_port_input *self_port,
+               const bt_port_output *other_port)
 {
        enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
        struct counter *counter;
-       struct bt_self_component_port_input_notification_iterator *iterator;
+       bt_self_component_port_input_notification_iterator *iterator;
 
        counter = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(comp));
@@ -195,7 +195,8 @@ enum bt_self_component_status counter_port_connected(
                goto end;
        }
 
-       BT_OBJECT_MOVE_REF(counter->notif_iter, iterator);
+       BT_SELF_COMPONENT_PORT_INPUT_NOTIFICATION_ITERATOR_MOVE_REF(
+               counter->notif_iter, iterator);
 
 end:
        return status;
@@ -203,13 +204,13 @@ end:
 
 BT_HIDDEN
 enum bt_self_component_status counter_consume(
-               struct bt_self_component_sink *comp)
+               bt_self_component_sink *comp)
 {
        enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
        struct counter *counter;
        enum bt_notification_iterator_status it_ret;
        uint64_t notif_count;
-       bt_notification_array notifs;
+       bt_notification_array_const notifs;
 
        counter = bt_self_component_get_data(
                        bt_self_component_sink_as_self_component(comp));
@@ -235,7 +236,7 @@ enum bt_self_component_status counter_consume(
                uint64_t i;
 
                for (i = 0; i < notif_count; i++) {
-                       struct bt_notification *notif = notifs[i];
+                       const bt_notification *notif = notifs[i];
 
                        BT_ASSERT(notif);
                        switch (bt_notification_get_type(notif)) {
@@ -245,13 +246,13 @@ enum bt_self_component_status counter_consume(
                        case BT_NOTIFICATION_TYPE_INACTIVITY:
                                counter->count.inactivity++;
                                break;
-                       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+                       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
                                counter->count.stream_begin++;
                                break;
                        case BT_NOTIFICATION_TYPE_STREAM_END:
                                counter->count.stream_end++;
                                break;
-                       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+                       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
                                counter->count.packet_begin++;
                                break;
                        case BT_NOTIFICATION_TYPE_PACKET_END:
@@ -261,7 +262,7 @@ enum bt_self_component_status counter_consume(
                                counter->count.other++;
                        }
 
-                       bt_object_put_ref(notif);
+                       bt_notification_put_ref(notif);
                }
 
                ret = BT_SELF_COMPONENT_STATUS_OK;