static
void destroy_pretty_data(struct pretty_component *pretty)
{
- bt_put(pretty->input_iterator);
+ bt_object_put_ref(pretty->input_iterator);
if (pretty->string) {
(void) g_string_free(pretty->string, TRUE);
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;
}
status = BT_COMPONENT_STATUS_ERROR;
}
- bt_put(connection);
+ bt_object_put_ref(connection);
return status;
}
switch (it_ret) {
case BT_NOTIFICATION_ITERATOR_STATUS_END:
ret = BT_COMPONENT_STATUS_END;
- BT_PUT(pretty->input_iterator);
+ BT_OBJECT_PUT_REF_AND_RESET(pretty->input_iterator);
goto end;
case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
ret = BT_COMPONENT_STATUS_AGAIN;
goto end;
}
- bt_put(notifs[i]);
+ bt_object_put_ref(notifs[i]);
}
end:
for (; i < count; i++) {
- bt_put(notifs[i]);
+ bt_object_put_ref(notifs[i]);
}
return ret;
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;
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);
}
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;
}
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;
}
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;
}
/* 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;
}
}
end:
- bt_put(pretty->plugin_opt_map);
+ bt_object_put_ref(pretty->plugin_opt_map);
pretty->plugin_opt_map = NULL;
g_free(str);
return ret;