Values API: standardize function names

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

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 1010917d09faada2fa8ef6510b53f3fc8f1bed4b..51480fbeda9dad6892757e274abd9fb39a91967c 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -134,16 +134,15 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
        BT_ASSERT(pretty);
 
        switch (bt_notification_get_type(notification)) {
+       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+               ret = pretty_print_packet(pretty, notification);
+               break;
        case BT_NOTIFICATION_TYPE_EVENT:
                ret = pretty_print_event(pretty, notification);
                break;
        case BT_NOTIFICATION_TYPE_INACTIVITY:
                fprintf(stderr, "Inactivity notification\n");
                break;
-       case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
-       case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
-               ret = pretty_print_discarded_elements(pretty, notification);
-               break;
        default:
                break;
        }
@@ -152,11 +151,12 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
 }
 
 BT_HIDDEN
-void pretty_port_connected(
+enum bt_component_status pretty_port_connected(
                struct bt_private_component *component,
                struct bt_private_port *self_port,
                struct bt_port *other_port)
 {
+       enum bt_component_status status = BT_COMPONENT_STATUS_OK;
        enum bt_connection_status conn_status;
        struct bt_private_connection *connection;
        struct pretty_component *pretty;
@@ -169,10 +169,11 @@ void pretty_port_connected(
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &pretty->input_iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
-               pretty->error = true;
+               status = BT_COMPONENT_STATUS_ERROR;
        }
 
        bt_put(connection);
+       return status;
 }
 
 BT_HIDDEN
@@ -187,11 +188,6 @@ enum bt_component_status pretty_consume(struct bt_private_component *component)
        uint64_t count = 0;
        uint64_t i = 0;
 
-       if (unlikely(pretty->error)) {
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
-
        it = pretty->input_iterator;
        it_ret = bt_private_connection_notification_iterator_next(it, &notifs,
                &count);
@@ -240,7 +236,7 @@ enum bt_component_status add_params_to_map(struct bt_value *plugin_opt_map)
                const char *key = plugin_options[i];
                enum bt_value_status status;
 
-               status = bt_value_map_insert(plugin_opt_map, key, bt_value_null);
+               status = bt_value_map_insert_entry(plugin_opt_map, key, bt_value_null);
                switch (status) {
                case BT_VALUE_STATUS_OK:
                        break;
@@ -259,7 +255,7 @@ bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
        struct pretty_component *pretty = data;
        struct bt_value *plugin_opt_map = pretty->plugin_opt_map;
 
-       if (!bt_value_map_has_key(plugin_opt_map, key)) {
+       if (!bt_value_map_has_entry(plugin_opt_map, key)) {
                fprintf(pretty->err,
                        "[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
        }
@@ -276,7 +272,7 @@ enum bt_component_status apply_one_string(const char *key,
        enum bt_value_status status;
        const char *str;
 
-       value = bt_value_map_borrow(params, key);
+       value = bt_value_map_borrow_entry_value(params, key);
        if (!value) {
                goto end;
        }
@@ -307,7 +303,7 @@ enum bt_component_status apply_one_bool(const char *key,
        enum bt_value_status status;
        bt_bool bool_val;
 
-       value = bt_value_map_borrow(params, key);
+       value = bt_value_map_borrow_entry_value(params, key);
        if (!value) {
                goto end;
        }
@@ -376,7 +372,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
                goto end;
        }
        /* Report unknown parameters. */
-       status = bt_value_map_foreach(params, check_param_exists, pretty);
+       status = bt_value_map_foreach_entry(params, check_param_exists, pretty);
        switch (status) {
        case BT_VALUE_STATUS_OK:
                break;
@@ -386,11 +382,11 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
        }
        /* Known parameters. */
        pretty->options.color = PRETTY_COLOR_OPT_AUTO;
-       if (bt_value_map_has_key(params, "color")) {
+       if (bt_value_map_has_entry(params, "color")) {
                struct bt_value *color_value;
                const char *color;
 
-               color_value = bt_value_map_borrow(params, "color");
+               color_value = bt_value_map_borrow_entry_value(params, "color");
                if (!color_value) {
                        goto end;
                }