X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_message_iterator.i.h;h=67b63fd6aa14e7a3bf6652c6eabf18435ad5b838;hb=9a2c8b8e0cb6579066b4b8ceb8255cdd5175bb2d;hp=deb149cfafd1d132eb655e472aebb222da0d6f74;hpb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt_message_iterator.i.h b/src/bindings/python/bt2/bt2/native_bt_message_iterator.i.h
index deb149cf..67b63fd6 100644
--- a/src/bindings/python/bt2/bt2/native_bt_message_iterator.i.h
+++ b/src/bindings/python/bt2/bt2/native_bt_message_iterator.i.h
@@ -22,38 +22,40 @@
  * THE SOFTWARE.
  */
 
-bt_self_component_port_input_message_iterator_create_from_message_iterator_status
-bt_bt2_self_component_port_input_message_iterator_create_from_message_iterator(
+static
+bt_message_iterator_create_from_message_iterator_status
+bt_bt2_message_iterator_create_from_message_iterator(
 		bt_self_message_iterator *self_msg_iter,
 		bt_self_component_port_input *input_port,
-		bt_self_component_port_input_message_iterator **message_iterator)
+		bt_message_iterator **message_iterator)
 {
-	bt_self_component_port_input_message_iterator_create_from_message_iterator_status
+	bt_message_iterator_create_from_message_iterator_status
 		status;
 
-	status = bt_self_component_port_input_message_iterator_create_from_message_iterator(
+	status = bt_message_iterator_create_from_message_iterator(
 		self_msg_iter, input_port, message_iterator);
 
-	if (status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
+	if (status != BT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
 		*message_iterator = NULL;
 	}
 
 	return status;
 }
 
-bt_self_component_port_input_message_iterator_create_from_sink_component_status
-bt_bt2_self_component_port_input_message_iterator_create_from_sink_component(
+static
+bt_message_iterator_create_from_sink_component_status
+bt_bt2_message_iterator_create_from_sink_component(
 		bt_self_component_sink *self_comp,
 		bt_self_component_port_input *input_port,
-		bt_self_component_port_input_message_iterator **message_iterator)
+		bt_message_iterator **message_iterator)
 {
-	bt_self_component_port_input_message_iterator_create_from_sink_component_status
+	bt_message_iterator_create_from_sink_component_status
 		status;
 
-	status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+	status = bt_message_iterator_create_from_sink_component(
 		self_comp, input_port, message_iterator);
 
-	if (status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+	if (status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
 		*message_iterator = NULL;
 	}
 
@@ -122,13 +124,13 @@ PyObject *get_msg_range_common(bt_message_iterator_next_status status,
 }
 
 static PyObject *bt_bt2_self_component_port_input_get_msg_range(
-		bt_self_component_port_input_message_iterator *iter)
+		bt_message_iterator *iter)
 {
 	bt_message_array_const messages;
 	uint64_t message_count = 0;
 	bt_message_iterator_next_status status;
 
-	status = bt_self_component_port_input_message_iterator_next(iter,
+	status = bt_message_iterator_next(iter,
 		&messages, &message_count);
 	return get_msg_range_common(status, messages, message_count);
 }