lib: add aliases for Babeltrace structure types

[babeltrace.git] / plugins / text / pretty / pretty.c

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 2d09aa5ee9aeba827c3d5735c57698799a9ed2b1..d9f1888bc1c1b8ed7000c2402faa6e2fae0ef3a4 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -65,7 +65,7 @@ const char *plugin_options[] = {
 static
 void destroy_pretty_data(struct pretty_component *pretty)
 {
-       bt_object_put_ref(pretty->iterator);
+       bt_self_component_port_input_notification_iterator_put_ref(pretty->iterator);
 
        if (pretty->string) {
                (void) g_string_free(pretty->string, TRUE);
@@ -113,7 +113,7 @@ error:
 }
 
 BT_HIDDEN
-void pretty_finalize(struct bt_self_component_sink *comp)
+void pretty_finalize(bt_self_component_sink *comp)
 {
        destroy_pretty_data(
                bt_self_component_get_data(
@@ -123,14 +123,14 @@ void pretty_finalize(struct bt_self_component_sink *comp)
 static
 enum bt_self_component_status handle_notification(
                struct pretty_component *pretty,
-               struct bt_notification *notification)
+               const bt_notification *notification)
 {
        enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
 
        BT_ASSERT(pretty);
 
        switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
                if (pretty_print_packet(pretty, notification)) {
                        ret = BT_SELF_COMPONENT_STATUS_ERROR;
                }
@@ -152,9 +152,9 @@ enum bt_self_component_status handle_notification(
 
 BT_HIDDEN
 enum bt_self_component_status pretty_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 pretty_component *pretty;
@@ -174,11 +174,11 @@ enum bt_self_component_status pretty_port_connected(
 
 BT_HIDDEN
 enum bt_self_component_status pretty_consume(
-               struct bt_self_component_sink *comp)
+               bt_self_component_sink *comp)
 {
        enum bt_self_component_status ret;
-       bt_notification_array notifs;
-       struct bt_self_component_port_input_notification_iterator *it;
+       bt_notification_array_const notifs;
+       bt_self_component_port_input_notification_iterator *it;
        struct pretty_component *pretty = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(comp));
        enum bt_notification_iterator_status it_ret;
@@ -200,7 +200,8 @@ enum bt_self_component_status pretty_consume(
                goto end;
        case BT_NOTIFICATION_ITERATOR_STATUS_END:
                ret = BT_SELF_COMPONENT_STATUS_END;
-               BT_OBJECT_PUT_REF_AND_RESET(pretty->iterator);
+               BT_SELF_COMPONENT_PORT_INPUT_NOTIFICATION_ITERATOR_PUT_REF_AND_RESET(
+                       pretty->iterator);
                goto end;
        default:
                ret = BT_SELF_COMPONENT_STATUS_ERROR;
@@ -215,19 +216,19 @@ enum bt_self_component_status pretty_consume(
                        goto end;
                }
 
-               bt_object_put_ref(notifs[i]);
+               bt_notification_put_ref(notifs[i]);
        }
 
 end:
        for (; i < count; i++) {
-               bt_object_put_ref(notifs[i]);
+               bt_notification_put_ref(notifs[i]);
        }
 
        return ret;
 }
 
 static
-int add_params_to_map(struct bt_value *plugin_opt_map)
+int add_params_to_map(bt_value *plugin_opt_map)
 {
        int ret = 0;
        unsigned int i;
@@ -251,7 +252,7 @@ end:
 }
 
 static
-bt_bool check_param_exists(const char *key, const struct bt_value *object,
+bt_bool check_param_exists(const char *key, const bt_value *object,
                void *data)
 {
        struct pretty_component *pretty = data;
@@ -265,9 +266,9 @@ bt_bool check_param_exists(const char *key, const struct bt_value *object,
 }
 
 static
-void apply_one_string(const char *key, const struct bt_value *params, char **option)
+void apply_one_string(const char *key, const bt_value *params, char **option)
 {
-       const struct bt_value *value = NULL;
+       const bt_value *value = NULL;
        const char *str;
 
        value = bt_value_map_borrow_entry_value_const(params, key);
@@ -285,10 +286,10 @@ end:
 }
 
 static
-void apply_one_bool(const char *key, const struct bt_value *params, bool *option,
+void apply_one_bool(const char *key, const bt_value *params, bool *option,
                bool *found)
 {
-       const struct bt_value *value = NULL;
+       const bt_value *value = NULL;
        bt_bool bool_val;
 
        value = bt_value_map_borrow_entry_value_const(params, key);
@@ -336,7 +337,7 @@ end:
 }
 
 static
-int apply_params(struct pretty_component *pretty, const struct bt_value *params)
+int apply_params(struct pretty_component *pretty, const bt_value *params)
 {
        int ret = 0;
        enum bt_value_status status;
@@ -365,7 +366,7 @@ int apply_params(struct pretty_component *pretty, const struct bt_value *params)
        /* Known parameters. */
        pretty->options.color = PRETTY_COLOR_OPT_AUTO;
        if (bt_value_map_has_entry(params, "color")) {
-               const struct bt_value *color_value;
+               const bt_value *color_value;
                const char *color;
 
                color_value = bt_value_map_borrow_entry_value_const(params,
@@ -592,7 +593,7 @@ int apply_params(struct pretty_component *pretty, const struct bt_value *params)
        }
 
 end:
-       bt_object_put_ref(pretty->plugin_opt_map);
+       bt_value_put_ref(pretty->plugin_opt_map);
        pretty->plugin_opt_map = NULL;
        g_free(str);
        return ret;
@@ -636,8 +637,8 @@ void init_stream_packet_context_quarks(void)
 
 BT_HIDDEN
 enum bt_self_component_status pretty_init(
-               struct bt_self_component_sink *comp,
-               const struct bt_value *params,
+               bt_self_component_sink *comp,
+               const bt_value *params,
                UNUSED_VAR void *init_method_data)
 {
        enum bt_self_component_status ret;