From 50e763f66f1e2016995f65c590bdbbae17b9b4ed Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 11 Sep 2019 11:43:19 -0400 Subject: [PATCH] lib: remove bt_self_port{,_input,_output} They are equivalent to/redundant with - bt_self_component_port - bt_self_component_port_input - bt_self_component_port_output Change-Id: I2c466d829f2fecd3567aea195aa08045be9b6f53 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2030 CI-Build: Francis Deslauriers Tested-by: jenkins Reviewed-by: Francis Deslauriers --- include/babeltrace2/graph/self-message-iterator.h | 2 +- include/babeltrace2/types.h | 3 --- src/lib/graph/iterator.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/babeltrace2/graph/self-message-iterator.h b/include/babeltrace2/graph/self-message-iterator.h index 025eb278..ad528e49 100644 --- a/include/babeltrace2/graph/self-message-iterator.h +++ b/include/babeltrace2/graph/self-message-iterator.h @@ -40,7 +40,7 @@ extern bt_self_component * bt_self_message_iterator_borrow_component( bt_self_message_iterator *message_iterator); -extern bt_self_port_output * +extern bt_self_component_port_output * bt_self_message_iterator_borrow_port( bt_self_message_iterator *message_iterator); diff --git a/include/babeltrace2/types.h b/include/babeltrace2/types.h index 55fba0ed..3e61f325 100644 --- a/include/babeltrace2/types.h +++ b/include/babeltrace2/types.h @@ -146,9 +146,6 @@ typedef struct bt_self_component_sink bt_self_component_sink; typedef struct bt_self_component_source bt_self_component_source; typedef struct bt_self_message_iterator bt_self_message_iterator; typedef struct bt_self_plugin bt_self_plugin; -typedef struct bt_self_port bt_self_port; -typedef struct bt_self_port_input bt_self_port_input; -typedef struct bt_self_port_output bt_self_port_output; typedef struct bt_stream bt_stream; typedef struct bt_stream_class bt_stream_class; typedef struct bt_trace bt_trace; diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index 81f7dd9d..3ebe11f8 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -951,7 +951,7 @@ struct bt_self_component *bt_self_message_iterator_borrow_component( return (void *) iterator->upstream_component; } -struct bt_self_port_output *bt_self_message_iterator_borrow_port( +struct bt_self_component_port_output *bt_self_message_iterator_borrow_port( struct bt_self_message_iterator *self_iterator) { struct bt_self_component_port_input_message_iterator *iterator = -- 2.34.1