#include "pretty.h"
-GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
-
static
const char *plugin_options[] = {
"color",
bt_self_component_sink_borrow_input_port_by_name(comp,
in_port_name));
if (!pretty->iterator) {
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR;
+ status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
}
return status;
bt_component_class_sink_consume_method_status pretty_consume(
bt_self_component_sink *comp)
{
- bt_component_class_sink_consume_method_status ret;
+ bt_component_class_sink_consume_method_status ret =
+ BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
bt_message_array_const msgs;
bt_self_component_port_input_message_iterator *it;
struct pretty_component *pretty = bt_self_component_get_data(
BT_ASSERT(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
for (i = 0; i < count; i++) {
- ret = handle_message(pretty, msgs[i]);
+ ret = (int) handle_message(pretty, msgs[i]);
if (ret) {
goto end;
}
apply_one_string("name-default", params, &str);
if (!str) {
pretty->options.name_default = PRETTY_DEFAULT_UNSET;
- } else if (!strcmp(str, "show")) {
+ } else if (strcmp(str, "show") == 0) {
pretty->options.name_default = PRETTY_DEFAULT_SHOW;
- } else if (!strcmp(str, "hide")) {
+ } else if (strcmp(str, "hide") == 0) {
pretty->options.name_default = PRETTY_DEFAULT_HIDE;
} else {
ret = -1;
apply_one_string("field-default", params, &str);
if (!str) {
pretty->options.field_default = PRETTY_DEFAULT_UNSET;
- } else if (!strcmp(str, "show")) {
+ } else if (strcmp(str, "show") == 0) {
pretty->options.field_default = PRETTY_DEFAULT_SHOW;
- } else if (!strcmp(str, "hide")) {
+ } else if (strcmp(str, "hide") == 0) {
pretty->options.field_default = PRETTY_DEFAULT_HIDE;
} else {
ret = -1;
}
}
-static
-void init_stream_packet_context_quarks(void)
-{
- stream_packet_context_quarks[Q_TIMESTAMP_BEGIN] =
- g_quark_from_string("timestamp_begin");
- stream_packet_context_quarks[Q_TIMESTAMP_BEGIN] =
- g_quark_from_string("timestamp_begin");
- stream_packet_context_quarks[Q_TIMESTAMP_END] =
- g_quark_from_string("timestamp_end");
- stream_packet_context_quarks[Q_EVENTS_DISCARDED] =
- g_quark_from_string("events_discarded");
- stream_packet_context_quarks[Q_CONTENT_SIZE] =
- g_quark_from_string("content_size");
- stream_packet_context_quarks[Q_PACKET_SIZE] =
- g_quark_from_string("packet_size");
- stream_packet_context_quarks[Q_PACKET_SEQ_NUM] =
- g_quark_from_string("packet_seq_num");
-}
-
BT_HIDDEN
bt_component_class_init_method_status pretty_init(
bt_self_component_sink *comp, const bt_value *params,
set_use_colors(pretty);
bt_self_component_set_data(
bt_self_component_sink_as_self_component(comp), pretty);
- init_stream_packet_context_quarks();
end:
return ret;