X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fcounter%2Fcounter.c;h=bf0e4a575f03d99499c84051889f4009a38dfba0;hb=e803df70898ad94809e70156df2e6bdfd4b1ee2a;hp=2ad601675054183bc44a4eb6a29eded3b333c07d;hpb=5f2a1585bf407f3f3aa7e63d9041b75390cf8563;p=babeltrace.git

diff --git a/src/plugins/utils/counter/counter.c b/src/plugins/utils/counter/counter.c
index 2ad60167..bf0e4a57 100644
--- a/src/plugins/utils/counter/counter.c
+++ b/src/plugins/utils/counter/counter.c
@@ -217,25 +217,28 @@ bt_component_class_sink_graph_is_configured_method_status
 counter_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 counter *counter;
 	bt_self_component_port_input_message_iterator *iterator;
 
 	counter = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(comp));
 	BT_ASSERT(counter);
-	iterator = bt_self_component_port_input_message_iterator_create_from_sink_component(
+
+	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));
-	if (!iterator) {
-		status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_MEMORY_ERROR;
+			in_port_name), &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;
 	}
 
 	BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF(
 		counter->msg_iter, iterator);
 
+	status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
 end:
 	return status;
 }