lib: make message iterator creation functions return a status

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

diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index 48c7a9a002d6fc4066d2c668c4dfc69f618bcc48..2bf9f7b741390156d7476796935997bbe8e57ac5 100644 (file)
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -34,8 +34,6 @@
 
 #include "pretty.h"
 
-GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
-
 static
 const char *plugin_options[] = {
        "color",
@@ -156,21 +154,26 @@ BT_HIDDEN
 bt_component_class_sink_graph_is_configured_method_status
 pretty_graph_is_configured(bt_self_component_sink *comp)
 {
-       bt_component_class_sink_graph_is_configured_method_status status =
-               BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+       bt_component_class_sink_graph_is_configured_method_status status;
+       bt_self_component_port_input_message_iterator_create_from_sink_component_status
+               msg_iter_status;
        struct pretty_component *pretty;
 
        pretty = bt_self_component_get_data(
                        bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(pretty);
        BT_ASSERT(!pretty->iterator);
-       pretty->iterator = bt_self_component_port_input_message_iterator_create(
-               bt_self_component_sink_borrow_input_port_by_name(comp,
-                       in_port_name));
-       if (!pretty->iterator) {
-               status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
+       msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+               comp, bt_self_component_sink_borrow_input_port_by_name(comp,
+                       in_port_name), &pretty->iterator);
+       if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+               status = (int) msg_iter_status;
+               goto end;
        }
 
+       status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+
+end:
        return status;
 }
 
@@ -609,25 +612,6 @@ void set_use_colors(struct pretty_component *pretty)
        }
 }
 
-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,
@@ -665,7 +649,6 @@ bt_component_class_init_method_status pretty_init(
        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;