X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fiterator.h;h=82689f61da6674a5975c22ea8bc217527e30ddda;hb=6c373cc9;hp=f48872ece5dde7d748f895ad430bf2dff8754280;hpb=c1859f693ac2a28d96e7ad492f8d66f74f33686f;p=babeltrace.git

diff --git a/src/lib/graph/message/iterator.h b/src/lib/graph/message/iterator.h
index f48872ec..82689f61 100644
--- a/src/lib/graph/message/iterator.h
+++ b/src/lib/graph/message/iterator.h
@@ -36,11 +36,6 @@
 struct bt_port;
 struct bt_graph;
 
-enum bt_message_iterator_type {
-	BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT,
-	BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT,
-};
-
 enum bt_self_component_port_input_message_iterator_state {
 	/* Iterator is not initialized */
 	BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED,
@@ -70,12 +65,6 @@ enum bt_self_component_port_input_message_iterator_state {
 	BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR,
 };
 
-struct bt_message_iterator {
-	struct bt_object base;
-	enum bt_message_iterator_type type;
-	GPtrArray *msgs;
-};
-
 typedef enum bt_component_class_message_iterator_next_method_status
 (*bt_self_component_port_input_message_iterator_next_method)(
 		void *, bt_message_array_const, uint64_t, uint64_t *);
@@ -97,7 +86,8 @@ typedef bt_bool
 		void *);
 
 struct bt_self_component_port_input_message_iterator {
-	struct bt_message_iterator base;
+	struct bt_object base;
+	GPtrArray *msgs;
 	struct bt_component *upstream_component; /* Weak */
 	struct bt_port *upstream_port; /* Weak */
 	struct bt_connection *connection; /* Weak */
@@ -199,18 +189,6 @@ struct bt_self_component_port_input_message_iterator {
 	void *user_data;
 };
 
-struct bt_port_output_message_iterator {
-	struct bt_message_iterator base;
-	struct bt_graph *graph; /* Owned by this */
-	struct bt_component_sink *colander; /* Owned by this */
-
-	/*
-	 * Only used temporarily as a bridge between a colander sink and
-	 * the user.
-	 */
-	uint64_t count;
-};
-
 BT_HIDDEN
 void bt_self_component_port_input_message_iterator_try_finalize(
 		struct bt_self_component_port_input_message_iterator *iterator);