X-Git-Url: https://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.c;h=85d6aae9a456930944316b8230b430242c72de6f;hp=14653172c9f0b4c47a0047ada268417e14fd1922;hb=643012d55c789824e01f7d2ad5db8063d7c7fae3;hpb=1c4634037c191b6ca22faa1864a878e88c2d5d8d diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c index 14653172..85d6aae9 100644 --- a/src/lib/graph/component.c +++ b/src/lib/graph/component.c @@ -450,6 +450,27 @@ struct bt_port_output *bt_component_borrow_output_port_by_index( borrow_port_by_index(comp->output_ports, index, api_func); } +static +bool port_name_is_unique(GPtrArray *ports, const char *name) +{ + guint i; + bool unique; + + for (i = 0; i < ports->len; i++) { + struct bt_port *port = g_ptr_array_index(ports, i); + + if (strcmp(port->name->str, name) == 0) { + unique = false; + goto end; + } + } + + unique = true; + +end: + return unique; +} + enum bt_self_component_add_port_status bt_component_add_input_port( struct bt_component *component, const char *name, void *user_data, struct bt_port **port, const char *api_func) @@ -457,7 +478,7 @@ enum bt_self_component_add_port_status bt_component_add_input_port( BT_ASSERT_PRE_COMP_NON_NULL_FROM_FUNC(api_func, component); BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name); BT_ASSERT_PRE_FROM_FUNC(api_func, "input-port-name-is-unique", - bt_component_port_name_is_unique(component->input_ports, name), + port_name_is_unique(component->input_ports, name), "Input port name is not unique: name=\"%s\", %![comp-]c", name, component); @@ -474,7 +495,7 @@ enum bt_self_component_add_port_status bt_component_add_output_port( BT_ASSERT_PRE_COMP_NON_NULL_FROM_FUNC(api_func, component); BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name); BT_ASSERT_PRE_FROM_FUNC(api_func, "output-port-name-is-unique", - bt_component_port_name_is_unique(component->output_ports, name), + port_name_is_unique(component->output_ports, name), "Output port name is not unique: name=\"%s\", %![comp-]c", name, component); @@ -483,26 +504,6 @@ enum bt_self_component_add_port_status bt_component_add_output_port( BT_PORT_TYPE_OUTPUT, name, user_data, port, api_func); } -bool bt_component_port_name_is_unique(GPtrArray *ports, const char *name) -{ - guint i; - bool unique; - - for (i = 0; i < ports->len; i++) { - struct bt_port *port = g_ptr_array_index(ports, i); - - if (strcmp(port->name->str, name) == 0) { - unique = false; - goto end; - } - } - - unique = true; - -end: - return unique; -} - enum bt_component_class_port_connected_method_status bt_component_port_connected( struct bt_component *comp, struct bt_port *self_port,