lib: private functions: do not repeat `private` word
authorPhilippe Proulx <eeppeliteloop@gmail.com>
Wed, 21 Nov 2018 15:39:48 +0000 (10:39 -0500)
committerFrancis Deslauriers <francis.deslauriers@efficios.com>
Thu, 2 May 2019 20:50:15 +0000 (20:50 +0000)
Some private function names look ridiculous. Because a private function
name already starts with `bt_private`, do not repeat the `private` word
elsewhere in the function name: we already know we're dealing with a
private function and private objects.

For example:

* Before this patch: bt_private_event_class_set_payload_private_field_class
* After this patch: bt_private_event_class_set_payload_field_class()

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
53 files changed:
include/babeltrace/graph/private-component-filter.h
include/babeltrace/graph/private-component-sink.h
include/babeltrace/graph/private-component-source.h
include/babeltrace/graph/private-notification-event.h
include/babeltrace/graph/private-notification-packet.h
include/babeltrace/graph/private-notification-stream.h
include/babeltrace/graph/private-port.h
include/babeltrace/trace-ir/private-event-class.h
include/babeltrace/trace-ir/private-event-header-field.h
include/babeltrace/trace-ir/private-event.h
include/babeltrace/trace-ir/private-field-classes.h
include/babeltrace/trace-ir/private-fields.h
include/babeltrace/trace-ir/private-packet-context-field.h
include/babeltrace/trace-ir/private-packet-header-field.h
include/babeltrace/trace-ir/private-packet.h
include/babeltrace/trace-ir/private-stream-class.h
include/babeltrace/trace-ir/private-stream.h
include/babeltrace/trace-ir/private-trace.h
lib/graph/component-class-sink-colander.c
lib/graph/filter.c
lib/graph/notification/event.c
lib/graph/notification/packet.c
lib/graph/port.c
lib/graph/sink.c
lib/graph/source.c
lib/trace-ir/event-class.c
lib/trace-ir/event-header-field.c
lib/trace-ir/event.c
lib/trace-ir/field-classes.c
lib/trace-ir/fields.c
lib/trace-ir/packet-context-field.c
lib/trace-ir/packet-header-field.c
lib/trace-ir/packet.c
lib/trace-ir/stream-class.c
lib/trace-ir/stream.c
lib/trace-ir/trace.c
plugins/ctf/common/metadata/ctf-meta-translate.c
plugins/ctf/common/notif-iter/notif-iter.c
plugins/ctf/fs-sink/writer.c
plugins/ctf/fs-src/data-stream-file.c
plugins/ctf/fs-src/fs.c
plugins/ctf/lttng-live/lttng-live.c
plugins/lttng-utils/plugin.c
plugins/text/dmesg/dmesg.c
plugins/text/pretty/pretty.c
plugins/utils/counter/counter.c
plugins/utils/dummy/dummy.c
plugins/utils/muxer/muxer.c
plugins/utils/trimmer/iterator.c
plugins/utils/trimmer/trimmer.c
tests/lib/test_bt_notification_iterator.c
tests/lib/test_graph_topo.c
tests/lib/test_trace_ir_ref.c

index 4431bffdeb8ff3e3a669acebe30a37e482f015d0..9b1de8cdda8e70bc4a04fc9a762f3c8b0eda14d8 100644 (file)
@@ -37,31 +37,31 @@ struct bt_private_component;
 struct bt_private_port;
 
 extern struct bt_private_port *
-bt_private_component_filter_get_output_private_port_by_name(
+bt_private_component_filter_get_output_port_by_name(
                struct bt_private_component *private_component,
                const char *name);
 
 extern struct bt_private_port *
-bt_private_component_filter_get_output_private_port_by_index(
+bt_private_component_filter_get_output_port_by_index(
                struct bt_private_component *private_component, uint64_t index);
 
 extern enum bt_component_status
-bt_private_component_filter_add_output_private_port(
+bt_private_component_filter_add_output_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **private_port);
 
 extern struct bt_private_port *
-bt_private_component_filter_get_input_private_port_by_name(
+bt_private_component_filter_get_input_port_by_name(
                struct bt_private_component *private_component,
                const char *name);
 
 extern struct bt_private_port *
-bt_private_component_filter_get_input_private_port_by_index(
+bt_private_component_filter_get_input_port_by_index(
                struct bt_private_component *private_component, uint64_t index);
 
 extern enum bt_component_status
-bt_private_component_filter_add_input_private_port(
+bt_private_component_filter_add_input_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **private_port);
index 853cff26723ab41299a2db81d6c57b25958f7802..ba7b29078ecc583c57169f6da307399a3d3502ce 100644 (file)
@@ -37,16 +37,16 @@ struct bt_private_component;
 struct bt_private_port;
 
 extern struct bt_private_port *
-bt_private_component_sink_get_input_private_port_by_name(
+bt_private_component_sink_get_input_port_by_name(
                struct bt_private_component *private_component,
                const char *name);
 
 extern struct bt_private_port *
-bt_private_component_sink_get_input_private_port_by_index(
+bt_private_component_sink_get_input_port_by_index(
                struct bt_private_component *private_component, uint64_t index);
 
 extern enum bt_component_status
-bt_private_component_sink_add_input_private_port(
+bt_private_component_sink_add_input_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **private_port);
index 29ed0b967f3396a3847bf8db28bd8a80807ceebd..0f4f41fc5ace6242a3d30065fddb9764462c9215 100644 (file)
@@ -37,17 +37,17 @@ struct bt_private_component;
 struct bt_private_port;
 
 extern struct bt_private_port *
-bt_private_component_source_get_output_private_port_by_name(
+bt_private_component_source_get_output_port_by_name(
                struct bt_private_component *private_component,
                const char *name);
 
 extern struct bt_private_port *
-bt_private_component_source_get_output_private_port_by_index(
+bt_private_component_source_get_output_port_by_index(
                struct bt_private_component *private_component,
                uint64_t index);
 
 extern enum bt_component_status
-bt_private_component_source_add_output_private_port(
+bt_private_component_source_add_output_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **private_port);
index c9a6ed476e5e8c362b48d568621945627f4fc595..8a046198df069741be834cbe84e321c9e92d5a03 100644 (file)
@@ -42,7 +42,7 @@ struct bt_private_notification *bt_private_notification_event_create(
                struct bt_private_packet *packet);
 
 extern struct bt_private_event *
-bt_private_notification_event_borrow_private_event(
+bt_private_notification_event_borrow_event(
                struct bt_private_notification *notification);
 
 #ifdef __cplusplus
index a3971d449544f70d8ce361ed91944da02c3d3878..2e0b21f2c1a1aff4ed59e2e3159962a85a4a69a3 100644 (file)
@@ -44,11 +44,11 @@ struct bt_private_notification *bt_private_notification_packet_end_create(
                struct bt_private_packet *packet);
 
 extern struct bt_private_packet *
-bt_private_notification_packet_begin_borrow_private_packet(
+bt_private_notification_packet_begin_borrow_packet(
                struct bt_private_notification *notification);
 
 extern struct bt_private_packet *
-bt_private_notification_packet_end_borrow_private_packet(
+bt_private_notification_packet_end_borrow_packet(
                struct bt_private_notification *notification);
 
 #ifdef __cplusplus
index 524fd29c29f67f14ca546cfea82231474393d2d9..bfdcf3c473b1eec2462fa84eabb8b3de80da2a6d 100644 (file)
@@ -46,14 +46,14 @@ struct bt_private_notification *bt_private_notification_stream_end_create(
                struct bt_private_stream *stream);
 
 extern struct bt_private_stream *
-bt_private_notification_stream_begin_borrow_private_stream(
+bt_private_notification_stream_begin_borrow_stream(
                struct bt_private_notification *notification);
 
 extern int bt_private_notification_stream_begin_set_default_clock_value(
                struct bt_private_notification *notif, uint64_t value_cycles);
 
 extern struct bt_private_stream *
-bt_private_notification_stream_end_borrow_private_stream(
+bt_private_notification_stream_end_borrow_stream(
                struct bt_private_notification *notification);
 
 extern int bt_private_notification_stream_end_set_default_clock_value(
index 32dc463f1cb1cda3a8688453d938a5e783d84a33..d7de16909b82498aecc670296acab5c921903b0c 100644 (file)
@@ -35,10 +35,10 @@ struct bt_private_connection;
 struct bt_port *bt_port_borrow_from_private(
                struct bt_private_port *private_port);
 
-extern struct bt_private_connection *bt_private_port_get_private_connection(
+extern struct bt_private_connection *bt_private_port_get_connection(
                struct bt_private_port *private_port);
 
-extern struct bt_private_component *bt_private_port_get_private_component(
+extern struct bt_private_component *bt_private_port_get_component(
                struct bt_private_port *private_port);
 
 extern enum bt_port_status bt_private_port_remove_from_component(
index 60251983afdce90722a0dbc7a11df6f271a6d213..f81f6103313bafc3c8309f97e3eced2b5d94b3f9 100644 (file)
@@ -51,7 +51,7 @@ extern struct bt_private_event_class *bt_private_event_class_create_with_id(
                struct bt_private_stream_class *stream_class, uint64_t id);
 
 extern struct bt_private_stream_class *
-bt_private_event_class_borrow_private_stream_class(
+bt_private_event_class_borrow_stream_class(
                struct bt_private_event_class *event_class);
 
 extern int bt_private_event_class_set_name(
@@ -66,18 +66,18 @@ extern int bt_private_event_class_set_emf_uri(
                const char *emf_uri);
 
 extern struct bt_private_field_class *
-bt_private_event_class_borrow_specific_context_private_field_class(
+bt_private_event_class_borrow_specific_context_field_class(
                struct bt_private_event_class *event_class);
 
-extern int bt_private_event_class_set_specific_context_private_field_class(
+extern int bt_private_event_class_set_specific_context_field_class(
                struct bt_private_event_class *event_class,
                struct bt_private_field_class *field_class);
 
 extern struct bt_private_field_class *
-bt_private_event_class_borrow_payload_private_field_class(
+bt_private_event_class_borrow_payload_field_class(
                struct bt_private_event_class *event_class);
 
-extern int bt_private_event_class_set_payload_private_field_class(
+extern int bt_private_event_class_set_payload_field_class(
                struct bt_private_event_class *event_class,
                struct bt_private_field_class *field_class);
 
index ab7e827eb2194e22389879a66d115fb0fa865773..fd1ac1f75ba0078aedf799c12220e193ba0ce347 100644 (file)
@@ -39,7 +39,7 @@ struct bt_private_event_header_field *bt_private_event_header_field_create(
                struct bt_private_stream_class *stream_class);
 
 extern
-struct bt_private_field *bt_private_event_header_field_borrow_private_field(
+struct bt_private_field *bt_private_event_header_field_borrow_field(
                struct bt_private_event_header_field *field);
 
 extern
index 3cca3052eaceee127565fd4c1e5fbcb61d5d7ef9..d6519c36125d106567ed8918cb1cdeb05c62451a 100644 (file)
@@ -50,22 +50,22 @@ extern struct bt_private_packet *bt_private_event_borrow_packet(
 extern struct bt_private_stream *bt_private_event_borrow_stream(
                struct bt_private_event *event);
 
-extern struct bt_private_field *bt_private_event_borrow_header_private_field(
+extern struct bt_private_field *bt_private_event_borrow_header_field(
                struct bt_private_event *event);
 
-extern int bt_private_event_move_private_header_field(
+extern int bt_private_event_move_header_field(
                struct bt_private_event *event,
                struct bt_private_event_header_field *header);
 
 extern struct bt_private_field *
-bt_private_event_borrow_common_context_private_field(
+bt_private_event_borrow_common_context_field(
                struct bt_private_event *event);
 
 extern struct bt_private_field *
-bt_private_event_borrow_specific_context_private_field(
+bt_private_event_borrow_specific_context_field(
                struct bt_private_event *event);
 
-extern struct bt_private_field *bt_private_event_borrow_payload_private_field(
+extern struct bt_private_field *bt_private_event_borrow_payload_field(
                struct bt_private_event *event);
 
 extern int bt_private_event_set_default_clock_value(
index 7463d3dc2cd9723a38340040aa54d11f700c5e5a..4ea7afc13ba503b7aac7e545255f7369ae35543b 100644 (file)
@@ -92,17 +92,17 @@ bt_private_field_class_string_create(void);
 extern struct bt_private_field_class *
 bt_private_field_class_structure_create(void);
 
-extern void bt_private_field_class_structure_borrow_private_member_by_index(
+extern void bt_private_field_class_structure_borrow_member_by_index(
                struct bt_private_field_class *struct_field_class,
                uint64_t index, const char **name,
                struct bt_private_field_class **field_class);
 
 extern
 struct bt_private_field_class *
-bt_private_field_class_structure_borrow_member_private_field_class_by_name(
+bt_private_field_class_structure_borrow_member_field_class_by_name(
                struct bt_private_field_class *field_class, const char *name);
 
-extern int bt_private_field_class_structure_append_private_member(
+extern int bt_private_field_class_structure_append_member(
                struct bt_private_field_class *struct_field_class,
                const char *name, struct bt_private_field_class *field_class);
 
@@ -116,28 +116,28 @@ bt_private_field_class_dynamic_array_create(
                struct bt_private_field_class *elem_field_class);
 
 extern struct bt_private_field_class *
-bt_private_field_class_array_borrow_element_private_field_class(
+bt_private_field_class_array_borrow_element_field_class(
                struct bt_private_field_class *field_class);
 
-extern int bt_private_field_class_dynamic_array_set_length_private_field_class(
+extern int bt_private_field_class_dynamic_array_set_length_field_class(
                struct bt_private_field_class *field_class,
                struct bt_private_field_class *length_field_class);
 
 extern struct bt_private_field_class *
 bt_private_field_class_variant_create(void);
 
-extern int bt_private_field_class_variant_set_selector_private_field_class(
+extern int bt_private_field_class_variant_set_selector_field_class(
                struct bt_private_field_class *field_class,
                struct bt_private_field_class *selector_field_class);
 
-extern void bt_private_field_class_variant_borrow_private_option_by_index(
+extern void bt_private_field_class_variant_borrow_option_by_index(
                struct bt_private_field_class *variant_field_class,
                uint64_t index, const char **name,
                struct bt_private_field_class **field_class);
 
 extern
 struct bt_private_field_class *
-bt_private_field_class_variant_borrow_option_private_field_class_by_name(
+bt_private_field_class_variant_borrow_option_field_class_by_name(
                struct bt_private_field_class *field_class, const char *name);
 
 extern int bt_private_field_class_variant_append_private_option(
index 4edc863634168fa4b5c56ed36cc1a42d769f2f71..09479edbe4830d646d02876474ac192366090059 100644 (file)
@@ -41,7 +41,7 @@ struct bt_private_field_class;
 extern struct bt_field *bt_field_borrow_from_private(
                struct bt_private_field *priv_field);
 
-extern struct bt_private_field_class *bt_private_field_borrow_private_class(
+extern struct bt_private_field_class *bt_private_field_borrow_class(
                struct bt_private_field *field);
 
 extern void bt_private_field_signed_integer_set_value(
@@ -66,28 +66,25 @@ extern int bt_private_field_string_append_with_length(
 extern int bt_private_field_string_clear(struct bt_private_field *field);
 
 extern struct bt_private_field *
-bt_private_field_structure_borrow_member_private_field_by_index(
+bt_private_field_structure_borrow_member_field_by_index(
                struct bt_private_field *field, uint64_t index);
 
 extern struct bt_private_field *
-bt_private_field_structure_borrow_member_private_field_by_name(
+bt_private_field_structure_borrow_member_field_by_name(
                struct bt_private_field *field, const char *name);
 
 extern struct bt_private_field *
-bt_private_field_array_borrow_element_private_field_by_index(
+bt_private_field_array_borrow_element_field_by_index(
                struct bt_private_field *field, uint64_t index);
 
 extern int bt_private_field_dynamic_array_set_length(
                struct bt_private_field *field, uint64_t length);
 
-extern int bt_private_field_variant_select_option_private_field(
+extern int bt_private_field_variant_select_option_field(
                struct bt_private_field *field, uint64_t index);
 
-extern uint64_t bt_private_field_variant_get_selected_option_private_field_index(
-               struct bt_private_field *field);
-
 extern struct bt_private_field *
-bt_private_field_variant_borrow_selected_option_private_field(
+bt_private_field_variant_borrow_selected_option_field(
                struct bt_private_field *field);
 
 #ifdef __cplusplus
index 08ce931cc699bf8a75d235c0da60cc14d292ffcd..dc55ca9b8340cdf6bb34f1a3a331402ad41535dc 100644 (file)
@@ -39,7 +39,7 @@ struct bt_private_packet_context_field *bt_private_packet_context_field_create(
                struct bt_private_stream_class *stream_class);
 
 extern
-struct bt_private_field *bt_private_packet_context_field_borrow_private_field(
+struct bt_private_field *bt_private_packet_context_field_borrow_field(
                struct bt_private_packet_context_field *field);
 
 extern
index 4e6164258df25a75a32267b4cfaf6428b06bf690..189e57abcbebf751db308bc8f7ebe273a9cbbd23 100644 (file)
@@ -39,7 +39,7 @@ struct bt_private_packet_header_field *bt_private_packet_header_field_create(
                struct bt_private_trace *trace);
 
 extern
-struct bt_private_field *bt_private_packet_header_field_borrow_private_field(
+struct bt_private_field *bt_private_packet_header_field_borrow_field(
                struct bt_private_packet_header_field *field);
 
 extern
index fab1fa731de62b10ebd688e9e3a650845e07f78b..33b7786c7306a8c337d713c19ce1bb205c6b73c6 100644 (file)
@@ -44,24 +44,24 @@ extern struct bt_packet *bt_packet_borrow_from_private(
 extern struct bt_private_packet *bt_private_packet_create(
                struct bt_private_stream *stream);
 
-extern struct bt_private_stream *bt_private_packet_borrow_private_stream(
+extern struct bt_private_stream *bt_private_packet_borrow_stream(
                struct bt_private_packet *packet);
 
 extern
-struct bt_private_field *bt_private_packet_borrow_header_private_field(
+struct bt_private_field *bt_private_packet_borrow_header_field(
                struct bt_private_packet *packet);
 
 extern
-int bt_private_packet_move_private_header_field(
+int bt_private_packet_move_header_field(
                struct bt_private_packet *packet,
                struct bt_private_packet_header_field *header);
 
 extern
-struct bt_private_field *bt_private_packet_borrow_context_private_field(
+struct bt_private_field *bt_private_packet_borrow_context_field(
                struct bt_private_packet *packet);
 
 extern
-int bt_private_packet_move_private_context_field(
+int bt_private_packet_move_context_field(
                struct bt_private_packet *packet,
                struct bt_private_packet_context_field *context);
 
index e251b267e5cbb50ec106ac9d6cd09ab7004bd743..f744ebc1c97a24f94de37e301572b98d5d8c629d 100644 (file)
@@ -52,7 +52,7 @@ extern struct bt_private_stream_class *bt_private_stream_class_create(
 extern struct bt_private_stream_class *bt_private_stream_class_create_with_id(
                struct bt_private_trace *trace, uint64_t id);
 
-extern struct bt_private_trace *bt_private_stream_class_borrow_private_trace(
+extern struct bt_private_trace *bt_private_stream_class_borrow_trace(
                struct bt_private_stream_class *stream_class);
 
 extern int bt_private_stream_class_set_name(
@@ -66,36 +66,36 @@ extern int bt_private_stream_class_set_assigns_automatic_stream_id(
                struct bt_private_stream_class *stream_class, bt_bool value);
 
 extern struct bt_private_field_class *
-bt_private_stream_class_borrow_packet_context_private_field_class(
+bt_private_stream_class_borrow_packet_context_field_class(
                struct bt_private_stream_class *stream_class);
 
-extern int bt_private_stream_class_set_packet_context_private_field_class(
+extern int bt_private_stream_class_set_packet_context_field_class(
                struct bt_private_stream_class *stream_class,
                struct bt_private_field_class *field_class);
 
 extern struct bt_private_field_class *
-bt_private_stream_class_borrow_event_header_private_field_class(
+bt_private_stream_class_borrow_event_header_field_class(
                struct bt_private_stream_class *stream_class);
 
-extern int bt_private_stream_class_set_event_header_private_field_class(
+extern int bt_private_stream_class_set_event_header_field_class(
                struct bt_private_stream_class *stream_class,
                struct bt_private_field_class *field_class);
 
 extern struct bt_private_field_class *
-bt_private_stream_class_borrow_event_common_context_private_field_class(
+bt_private_stream_class_borrow_event_common_context_field_class(
                struct bt_private_stream_class *stream_class);
 
 extern int
-bt_private_stream_class_set_event_common_context_private_field_class(
+bt_private_stream_class_set_event_common_context_field_class(
                struct bt_private_stream_class *stream_class,
                struct bt_private_field_class *field_class);
 
 extern struct bt_private_event_class *
-bt_private_stream_class_borrow_private_event_class_by_index(
+bt_private_stream_class_borrow_event_class_by_index(
                struct bt_private_stream_class *stream_class, uint64_t index);
 
 extern struct bt_private_event_class *
-bt_private_stream_class_borrow_private_event_class_by_id(
+bt_private_stream_class_borrow_event_class_by_id(
                struct bt_private_stream_class *stream_class, uint64_t id);
 
 extern int bt_private_stream_class_set_default_clock_class(
index 6a8d0bb38c9dcab7a673bf06d50cb00eec705868..39e019d3768417d6f0d8785601fae6daac2f5927 100644 (file)
@@ -47,7 +47,7 @@ extern struct bt_private_stream *bt_private_stream_create(
 extern struct bt_private_stream *bt_private_stream_create_with_id(
                struct bt_private_stream_class *stream_class, uint64_t id);
 
-extern struct bt_private_stream_class *bt_private_stream_borrow_private_class(
+extern struct bt_private_stream_class *bt_private_stream_borrow_class(
                struct bt_private_stream *stream);
 
 extern int bt_private_stream_set_name(struct bt_private_stream *stream,
index a3651162f645098ab13b72f574ac8c186e4b9fb7..5b429494ade5f6154decbdbe617d05346202f2d0 100644 (file)
@@ -65,40 +65,40 @@ extern int bt_private_trace_set_name(struct bt_private_trace *trace,
 extern int bt_private_trace_set_uuid(struct bt_private_trace *trace,
                bt_uuid uuid);
 
-extern void bt_private_trace_borrow_private_environment_entry_by_index(
+extern void bt_private_trace_borrow_environment_entry_by_index(
                struct bt_private_trace *trace, uint64_t index,
                const char **name, struct bt_private_value **value);
 
 extern struct bt_private_value *
-bt_private_trace_borrow_private_environment_entry_value_by_name(
+bt_private_trace_borrow_environment_entry_value_by_name(
                struct bt_private_trace *trace, const char *name);
 
-extern int bt_private_trace_set_private_environment_entry_integer(
+extern int bt_private_trace_set_environment_entry_integer(
                struct bt_private_trace *trace, const char *name,
                int64_t value);
 
-extern int bt_private_trace_set_private_environment_entry_string(
+extern int bt_private_trace_set_environment_entry_string(
                struct bt_private_trace *trace, const char *name,
                const char *value);
 
 extern struct bt_private_field_class *
-bt_private_trace_borrow_packet_header_private_field_class(
+bt_private_trace_borrow_packet_header_field_class(
                struct bt_private_trace *trace);
 
-extern int bt_private_trace_set_packet_header_private_field_class(
+extern int bt_private_trace_set_packet_header_field_class(
                struct bt_private_trace *trace,
                struct bt_private_field_class *packet_header_field_class);
 
 extern struct bt_private_stream_class *
-bt_private_trace_borrow_private_stream_class_by_index(
+bt_private_trace_borrow_stream_class_by_index(
                struct bt_private_trace *trace, uint64_t index);
 
 extern struct bt_private_stream_class *
-bt_private_trace_borrow_private_stream_class_by_id(
+bt_private_trace_borrow_stream_class_by_id(
                struct bt_private_trace *trace, uint64_t id);
 
 extern struct bt_private_stream *
-bt_private_trace_borrow_private_stream_by_index(
+bt_private_trace_borrow_stream_by_index(
                struct bt_private_trace *trace, uint64_t index);
 
 extern struct bt_private_stream *bt_private_trace_borrow_stream_by_id(
index d1b75fea99ba7e811693ac689aaf0a5d0b2426d2..f1067d41afa334c5c87c52de88dd65605a815d29 100644 (file)
@@ -69,7 +69,7 @@ enum bt_component_status colander_init(
 
        colander_data->notifs = user_provided_data->notifs;
        colander_data->count_addr = user_provided_data->count_addr;
-       status = bt_private_component_sink_add_input_private_port(
+       status = bt_private_component_sink_add_input_port(
                priv_comp, "in", NULL, NULL);
        if (status != BT_COMPONENT_STATUS_OK) {
                BT_LOGE_STR("Cannot add input port.");
@@ -107,7 +107,7 @@ enum bt_component_status colander_port_connected(struct bt_private_component *pr
        enum bt_component_status status = BT_COMPONENT_STATUS_OK;
        enum bt_connection_status conn_status;
        struct bt_private_connection *priv_conn =
-               bt_private_port_get_private_connection(self_priv_port);
+               bt_private_port_get_connection(self_priv_port);
        struct colander_data *colander_data =
                bt_private_component_get_user_data(priv_comp);
 
index 539443efe977e7052985eb8ac9d8f8692a37169a..c25160f555e88380a29db07fa000d40df9034e0f 100644 (file)
@@ -224,7 +224,7 @@ end:
 }
 
 struct bt_private_port *
-bt_private_component_filter_get_input_private_port_by_index(
+bt_private_component_filter_get_input_port_by_index(
                struct bt_private_component *private_component, uint64_t index)
 {
        /* bt_component_filter_get_input_port_by_index() logs details/errors */
@@ -234,7 +234,7 @@ bt_private_component_filter_get_input_private_port_by_index(
 }
 
 struct bt_private_port *
-bt_private_component_filter_get_input_private_port_by_name(
+bt_private_component_filter_get_input_port_by_name(
                struct bt_private_component *private_component,
                const char *name)
 {
@@ -244,7 +244,7 @@ bt_private_component_filter_get_input_private_port_by_name(
                        bt_component_borrow_from_private(private_component), name));
 }
 
-enum bt_component_status bt_private_component_filter_add_input_private_port(
+enum bt_component_status bt_private_component_filter_add_input_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **user_priv_port)
@@ -300,7 +300,7 @@ end:
 }
 
 struct bt_private_port *
-bt_private_component_filter_get_output_private_port_by_index(
+bt_private_component_filter_get_output_port_by_index(
                struct bt_private_component *private_component, uint64_t index)
 {
        /* bt_component_filter_get_output_port_by_index() logs details/errors */
@@ -310,7 +310,7 @@ bt_private_component_filter_get_output_private_port_by_index(
 }
 
 struct bt_private_port *
-bt_private_component_filter_get_output_private_port_by_name(
+bt_private_component_filter_get_output_port_by_name(
                struct bt_private_component *private_component,
                const char *name)
 {
@@ -320,7 +320,7 @@ bt_private_component_filter_get_output_private_port_by_name(
                        bt_component_borrow_from_private(private_component), name));
 }
 
-enum bt_component_status bt_private_component_filter_add_output_private_port(
+enum bt_component_status bt_private_component_filter_add_output_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **user_priv_port)
index 18f6a4ac585a0806116d84b10a0654651509fff4..bd0d077b50258204051c04c1fea11bd1017113ea 100644 (file)
@@ -202,7 +202,7 @@ struct bt_event *bt_notification_event_borrow_event(
        return event_notification->event;
 }
 
-struct bt_private_event *bt_private_notification_event_borrow_private_event(
+struct bt_private_event *bt_private_notification_event_borrow_event(
                struct bt_private_notification *notification)
 {
        return (void *) bt_notification_event_borrow_event(
index 6752bee05c3876355dd0d5ff6a4a803b5767893c..64d24cbd818f31c588a798d461ade910f1aa9537 100644 (file)
@@ -164,7 +164,7 @@ struct bt_packet *bt_notification_packet_begin_borrow_packet(
 }
 
 struct bt_private_packet *
-bt_private_notification_packet_begin_borrow_private_packet(
+bt_private_notification_packet_begin_borrow_packet(
                struct bt_private_notification *notification)
 {
        return (void *) bt_notification_packet_begin_borrow_packet(
index 4e1b44bb6e78248aa3c6423df1789bc0603d7dbb..6660c66aeebad3fdea2dcf3fc614158060d9e5ad 100644 (file)
@@ -141,14 +141,14 @@ struct bt_component *bt_port_get_component(struct bt_port *port)
        return (struct bt_component *) bt_object_get_parent(&port->base);
 }
 
-struct bt_private_connection *bt_private_port_get_private_connection(
+struct bt_private_connection *bt_private_port_get_connection(
                struct bt_private_port *private_port)
 {
        return bt_private_connection_from_connection(bt_port_get_connection(
                bt_port_borrow_from_private(private_port)));
 }
 
-struct bt_private_component *bt_private_port_get_private_component(
+struct bt_private_component *bt_private_port_get_component(
                struct bt_private_port *private_port)
 {
        return bt_private_component_from_component(bt_port_get_component(
index 5a8996fc4e7572f8e6d30a1fb5aad08410591e91..dc107017d518b7c6e982a5a9f9989e815af707fd 100644 (file)
@@ -142,7 +142,7 @@ end:
 }
 
 struct bt_private_port *
-bt_private_component_sink_get_input_private_port_by_index(
+bt_private_component_sink_get_input_port_by_index(
                struct bt_private_component *private_component, uint64_t index)
 {
        /* bt_component_sink_get_input_port_by_index() logs details/errors */
@@ -152,7 +152,7 @@ bt_private_component_sink_get_input_private_port_by_index(
 }
 
 struct bt_private_port *
-bt_private_component_sink_get_input_private_port_by_name(
+bt_private_component_sink_get_input_port_by_name(
                struct bt_private_component *private_component,
                const char *name)
 {
@@ -162,7 +162,7 @@ bt_private_component_sink_get_input_private_port_by_name(
                        bt_component_borrow_from_private(private_component), name));
 }
 
-enum bt_component_status bt_private_component_sink_add_input_private_port(
+enum bt_component_status bt_private_component_sink_add_input_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **user_priv_port)
index a573df152a355761552ca05a672a9700c4196604..3510c00cf42d516674c43eacb99b708a4d62fa1d 100644 (file)
@@ -143,7 +143,7 @@ end:
 }
 
 struct bt_private_port *
-bt_private_component_source_get_output_private_port_by_name(
+bt_private_component_source_get_output_port_by_name(
                struct bt_private_component *private_component,
                const char *name)
 {
@@ -154,7 +154,7 @@ bt_private_component_source_get_output_private_port_by_name(
 }
 
 struct bt_private_port *
-bt_private_component_source_get_output_private_port_by_index(
+bt_private_component_source_get_output_port_by_index(
                struct bt_private_component *private_component, uint64_t index)
 {
        /* bt_component_source_get_output_port_by_index() logs details/errors */
@@ -163,7 +163,7 @@ bt_private_component_source_get_output_private_port_by_index(
                        bt_component_borrow_from_private(private_component), index));
 }
 
-enum bt_component_status bt_private_component_source_add_output_private_port(
+enum bt_component_status bt_private_component_source_add_output_port(
                struct bt_private_component *private_component,
                const char *name, void *user_data,
                struct bt_private_port **user_priv_port)
index 9574a9da415f6c44eec7e18c08b70b4965f26c98..7c4ff432006a29ae76ccd033c5ec0f58d0eb7654 100644 (file)
@@ -270,7 +270,7 @@ struct bt_stream_class *bt_event_class_borrow_stream_class(
 }
 
 struct bt_private_stream_class *
-bt_private_event_class_borrow_private_stream_class(
+bt_private_event_class_borrow_stream_class(
                struct bt_private_event_class *event_class)
 {
        return (void *) bt_event_class_borrow_stream_class(
@@ -285,14 +285,14 @@ struct bt_field_class *bt_event_class_borrow_specific_context_field_class(
 }
 
 struct bt_private_field_class *
-bt_private_event_class_borrow_specific_context_private_field_class(
+bt_private_event_class_borrow_specific_context_field_class(
                struct bt_private_event_class *event_class)
 {
        return (void *) bt_event_class_borrow_specific_context_field_class(
                (void *) event_class);
 }
 
-int bt_private_event_class_set_specific_context_private_field_class(
+int bt_private_event_class_set_specific_context_field_class(
                struct bt_private_event_class *priv_event_class,
                struct bt_private_field_class *priv_field_class)
 {
@@ -349,14 +349,14 @@ struct bt_field_class *bt_event_class_borrow_payload_field_class(
        return event_class->payload_fc;
 }
 
-struct bt_private_field_class *bt_private_event_class_borrow_payload_private_field_class(
+struct bt_private_field_class *bt_private_event_class_borrow_payload_field_class(
                struct bt_private_event_class *event_class)
 {
        return (void *) bt_event_class_borrow_payload_field_class(
                (void *) event_class);
 }
 
-int bt_private_event_class_set_payload_private_field_class(
+int bt_private_event_class_set_payload_field_class(
                struct bt_private_event_class *priv_event_class,
                struct bt_private_field_class *priv_field_class)
 {
index 370611744837260570dd9dcd9530a8870eca9a3c..dce753352597f4c23150f0cc3969ab02f824e871 100644 (file)
@@ -30,7 +30,7 @@
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <glib.h>
 
-struct bt_private_field *bt_private_event_header_field_borrow_private_field(
+struct bt_private_field *bt_private_event_header_field_borrow_field(
                struct bt_private_event_header_field *header_field)
 {
        struct bt_field_wrapper *field_wrapper = (void *) header_field;
index c2f772a56521e9f6095418c8894522b4a7905d67..b7d4607c037d5d343a6b6a9eb776c116f03c5974 100644 (file)
@@ -217,7 +217,7 @@ struct bt_field *bt_event_borrow_header_field(struct bt_event *event)
        return event->header_field ? event->header_field->field : NULL;
 }
 
-struct bt_private_field *bt_private_event_borrow_header_private_field(
+struct bt_private_field *bt_private_event_borrow_header_field(
                struct bt_private_event *event)
 {
        return (void *) bt_event_borrow_header_field((void *) event);
@@ -229,7 +229,7 @@ struct bt_field *bt_event_borrow_common_context_field(struct bt_event *event)
        return event->common_context_field;
 }
 
-struct bt_private_field *bt_private_event_borrow_common_context_private_field(
+struct bt_private_field *bt_private_event_borrow_common_context_field(
                struct bt_private_event *event)
 {
        return (void *) bt_event_borrow_common_context_field((void *) event);
@@ -241,7 +241,7 @@ struct bt_field *bt_event_borrow_specific_context_field(struct bt_event *event)
        return event->specific_context_field;
 }
 
-struct bt_private_field *bt_private_event_borrow_specific_context_private_field(
+struct bt_private_field *bt_private_event_borrow_specific_context_field(
                struct bt_private_event *event)
 {
        return (void *) bt_event_borrow_specific_context_field((void *) event);
@@ -253,7 +253,7 @@ struct bt_field *bt_event_borrow_payload_field(struct bt_event *event)
        return event->payload_field;
 }
 
-struct bt_private_field *bt_private_event_borrow_payload_private_field(
+struct bt_private_field *bt_private_event_borrow_payload_field(
                struct bt_private_event *event)
 {
        return (void *) bt_event_borrow_payload_field((void *) event);
@@ -353,7 +353,7 @@ struct bt_private_packet *bt_private_event_borrow_packet(
        return (void *) bt_event_borrow_packet((void *) event);
 }
 
-int bt_private_event_move_private_header_field(
+int bt_private_event_move_header_field(
                struct bt_private_event *priv_event,
                struct bt_private_event_header_field *priv_header_field)
 {
index b2cee6e1ca5f1f8385f51905bdb58767fbf80260..668bc46b9f27b02561496da88edbcbfa07a3169c 100644 (file)
@@ -772,7 +772,7 @@ end:
        return ret;
 }
 
-int bt_private_field_class_structure_append_private_member(
+int bt_private_field_class_structure_append_member(
                struct bt_private_field_class *priv_fc,
                const char *name, struct bt_private_field_class *member_fc)
 {
@@ -820,7 +820,7 @@ void bt_field_class_structure_borrow_member_by_index(
                index, name, out_fc);
 }
 
-void bt_private_field_class_structure_borrow_private_member_by_index(
+void bt_private_field_class_structure_borrow_member_by_index(
                struct bt_private_field_class *fc, uint64_t index,
                const char **name, struct bt_private_field_class **out_fc)
 {
@@ -863,7 +863,7 @@ struct bt_field_class *bt_field_class_structure_borrow_member_field_class_by_nam
 }
 
 struct bt_private_field_class *
-bt_private_field_class_structure_borrow_member_private_field_class_by_name(
+bt_private_field_class_structure_borrow_member_field_class_by_name(
                struct bt_private_field_class *fc, const char *name)
 {
        return (void *) bt_field_class_structure_borrow_member_field_class_by_name(
@@ -911,7 +911,7 @@ end:
        return (void *) var_fc;
 }
 
-int bt_private_field_class_variant_set_selector_private_field_class(
+int bt_private_field_class_variant_set_selector_field_class(
                struct bt_private_field_class *priv_fc,
                struct bt_private_field_class *selector_fc)
 {
@@ -950,7 +950,7 @@ struct bt_field_class *bt_field_class_variant_borrow_option_field_class_by_name(
 }
 
 struct bt_private_field_class *
-bt_private_field_class_variant_borrow_option_private_field_class_by_name(
+bt_private_field_class_variant_borrow_option_field_class_by_name(
                struct bt_private_field_class *fc, const char *name)
 {
        return (void *) bt_field_class_variant_borrow_option_field_class_by_name(
@@ -976,7 +976,7 @@ void bt_field_class_variant_borrow_option_by_index(
                index, name, out_fc);
 }
 
-void bt_private_field_class_variant_borrow_private_option_by_index(
+void bt_private_field_class_variant_borrow_option_by_index(
                struct bt_private_field_class *fc, uint64_t index,
                const char **name, struct bt_private_field_class **out_fc)
 {
@@ -1119,7 +1119,7 @@ end:
        return (void *) array_fc;
 }
 
-int bt_private_field_class_dynamic_array_set_length_private_field_class(
+int bt_private_field_class_dynamic_array_set_length_field_class(
                struct bt_private_field_class *priv_fc,
                struct bt_private_field_class *priv_length_fc)
 {
index d374d0a0dceab8297c01cb4e6651bb1d42e7e672..eb367c7e5eb4b31b3847d5ad2dcaf714e6c3afa1 100644 (file)
@@ -189,7 +189,7 @@ struct bt_field_class *bt_field_borrow_class(struct bt_field *field)
        return field->class;
 }
 
-struct bt_private_field_class *bt_private_field_borrow_private_class(
+struct bt_private_field_class *bt_private_field_borrow_class(
                struct bt_private_field *field)
 {
        return (void *) bt_field_borrow_class((void *) field);
@@ -754,7 +754,7 @@ struct bt_field *bt_field_array_borrow_element_field_by_index(
 }
 
 struct bt_private_field *
-bt_private_field_array_borrow_element_private_field_by_index(
+bt_private_field_array_borrow_element_field_by_index(
                struct bt_private_field *field, uint64_t index)
 {
        return (void *) bt_field_array_borrow_element_field_by_index(
@@ -774,7 +774,7 @@ struct bt_field *bt_field_structure_borrow_member_field_by_index(
 }
 
 struct bt_private_field *
-bt_private_field_structure_borrow_member_private_field_by_index(
+bt_private_field_structure_borrow_member_field_by_index(
                struct bt_private_field *field, uint64_t index)
 {
        return (void *) bt_field_structure_borrow_member_field_by_index(
@@ -809,7 +809,7 @@ end:
 }
 
 struct bt_private_field *
-bt_private_field_structure_borrow_member_private_field_by_name(
+bt_private_field_structure_borrow_member_field_by_name(
                struct bt_private_field *field, const char *name)
 {
        return (void *) bt_field_structure_borrow_member_field_by_name(
@@ -830,14 +830,14 @@ struct bt_field *bt_field_variant_borrow_selected_option_field(
 }
 
 struct bt_private_field *
-bt_private_field_variant_borrow_selected_option_private_field(
+bt_private_field_variant_borrow_selected_option_field(
                struct bt_private_field *field)
 {
        return (void *) bt_field_variant_borrow_selected_option_field(
                (void *) field);
 }
 
-int bt_private_field_variant_select_option_private_field(
+int bt_private_field_variant_select_option_field(
                struct bt_private_field *priv_field, uint64_t index)
 {
        struct bt_field *field = (void *) priv_field;
index 967ba52c75cec7a6968261ca410e917ef6ecf0c7..b71c6de47df0d02dd670ee2051e5e347c9ca612b 100644 (file)
@@ -30,7 +30,7 @@
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <glib.h>
 
-struct bt_private_field *bt_private_packet_context_field_borrow_private_field(
+struct bt_private_field *bt_private_packet_context_field_borrow_field(
                struct bt_private_packet_context_field *context_field)
 {
        struct bt_field_wrapper *field_wrapper = (void *) context_field;
index b02704bc11529aabb15ad3c6e67b35ca759fa2ea..b381100cb3e2b6d6e324d4e008c7d606bd07e26d 100644 (file)
@@ -30,7 +30,7 @@
 #include <babeltrace/trace-ir/fields-internal.h>
 #include <glib.h>
 
-struct bt_private_field *bt_private_packet_header_field_borrow_private_field(
+struct bt_private_field *bt_private_packet_header_field_borrow_field(
                struct bt_private_packet_header_field *header_field)
 {
        struct bt_field_wrapper *field_wrapper = (void *) header_field;
index f44434538f1cfcb3b19addb6d7a8e68679ae2c54..3c01165fbd08e0ace523116f350b4bf68798be68 100644 (file)
@@ -50,7 +50,7 @@ struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet)
        return packet->stream;
 }
 
-struct bt_private_stream *bt_private_packet_borrow_private_stream(
+struct bt_private_stream *bt_private_packet_borrow_stream(
                struct bt_private_packet *packet)
 {
        return (void *) bt_packet_borrow_stream((void *) packet);
@@ -62,7 +62,7 @@ struct bt_field *bt_packet_borrow_header_field(struct bt_packet *packet)
        return packet->header_field ? packet->header_field->field : NULL;
 }
 
-struct bt_private_field *bt_private_packet_borrow_header_private_field(
+struct bt_private_field *bt_private_packet_borrow_header_field(
                struct bt_private_packet *packet)
 {
        return (void *) bt_packet_borrow_header_field((void *) packet);
@@ -74,7 +74,7 @@ struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
        return packet->context_field ? packet->context_field->field : NULL;
 }
 
-struct bt_private_field *bt_private_packet_borrow_context_private_field(
+struct bt_private_field *bt_private_packet_borrow_context_field(
                struct bt_private_packet *packet)
 {
        return (void *) bt_packet_borrow_context_field((void *) packet);
@@ -342,7 +342,7 @@ end:
        return (void *) packet;
 }
 
-int bt_private_packet_move_private_header_field(
+int bt_private_packet_move_header_field(
                struct bt_private_packet *priv_packet,
                struct bt_private_packet_header_field *header_field)
 {
@@ -372,7 +372,7 @@ int bt_private_packet_move_private_header_field(
        return 0;
 }
 
-int bt_private_packet_move_private_context_field(
+int bt_private_packet_move_context_field(
                struct bt_private_packet *priv_packet,
                struct bt_private_packet_context_field *context_field)
 {
index 8c5133b1368e902e00c51e553b328900ef4a0f04..f99ce1adf9aa306d4453a43dd625f1041d728cad 100644 (file)
@@ -258,7 +258,7 @@ struct bt_event_class *bt_stream_class_borrow_event_class_by_index(
 }
 
 struct bt_private_event_class *
-bt_private_stream_class_borrow_private_event_class_by_index(
+bt_private_stream_class_borrow_event_class_by_index(
                struct bt_private_stream_class *stream_class, uint64_t index)
 {
        return (void *) bt_stream_class_borrow_event_class_by_index(
@@ -288,7 +288,7 @@ end:
 }
 
 struct bt_private_event_class *
-bt_private_stream_class_borrow_private_event_class_by_id(
+bt_private_stream_class_borrow_event_class_by_id(
                struct bt_private_stream_class *stream_class, uint64_t id)
 {
        return (void *) bt_stream_class_borrow_event_class_by_id(
@@ -303,14 +303,14 @@ struct bt_field_class *bt_stream_class_borrow_packet_context_field_class(
 }
 
 struct bt_private_field_class *
-bt_private_stream_class_borrow_packet_context_private_field_class(
+bt_private_stream_class_borrow_packet_context_field_class(
                struct bt_private_stream_class *stream_class)
 {
        return (void *) bt_stream_class_borrow_packet_context_field_class(
                (void *) stream_class);
 }
 
-int bt_private_stream_class_set_packet_context_private_field_class(
+int bt_private_stream_class_set_packet_context_field_class(
                struct bt_private_stream_class *priv_stream_class,
                struct bt_private_field_class *priv_field_class)
 {
@@ -359,14 +359,14 @@ struct bt_field_class *bt_stream_class_borrow_event_header_field_class(
 }
 
 struct bt_private_field_class *
-bt_private_stream_class_borrow_event_header_private_field_class(
+bt_private_stream_class_borrow_event_header_field_class(
                struct bt_private_stream_class *stream_class)
 {
        return (void *) bt_stream_class_borrow_event_header_field_class(
                (void *) stream_class);
 }
 
-int bt_private_stream_class_set_event_header_private_field_class(
+int bt_private_stream_class_set_event_header_field_class(
                struct bt_private_stream_class *priv_stream_class,
                struct bt_private_field_class *priv_field_class)
 {
@@ -416,14 +416,14 @@ struct bt_field_class *bt_stream_class_borrow_event_common_context_field_class(
 }
 
 struct bt_private_field_class *
-bt_private_stream_class_borrow_event_common_context_private_field_class(
+bt_private_stream_class_borrow_event_common_context_field_class(
                struct bt_private_stream_class *stream_class)
 {
        return (void *) bt_stream_class_borrow_event_common_context_field_class(
                (void *) stream_class);
 }
 
-int bt_private_stream_class_set_event_common_context_private_field_class(
+int bt_private_stream_class_set_event_common_context_field_class(
                struct bt_private_stream_class *priv_stream_class,
                struct bt_private_field_class *priv_field_class)
 {
index 546b5c4438e0ad5847a606fefbe71c6027423903..15810b7b9eba1c060ac5f1f85ece2c94b700ea9e 100644 (file)
@@ -177,7 +177,7 @@ struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
        return stream->class;
 }
 
-struct bt_private_stream_class *bt_private_stream_borrow_private_class(
+struct bt_private_stream_class *bt_private_stream_borrow_class(
                struct bt_private_stream *priv_stream)
 {
        return (void *) bt_stream_borrow_class((void *) priv_stream);
index 5c0546fe7e84ed273e59a2beb91b7d09f7491100..2c572f67064dbe38a06e873248e76fc6d52fe819 100644 (file)
@@ -278,7 +278,7 @@ int set_environment_entry(struct bt_trace *trace, const char *name,
        return ret;
 }
 
-int bt_private_trace_set_private_environment_entry_string(
+int bt_private_trace_set_environment_entry_string(
                struct bt_private_trace *priv_trace,
                const char *name, const char *value)
 {
@@ -304,7 +304,7 @@ end:
        return ret;
 }
 
-int bt_private_trace_set_private_environment_entry_integer(
+int bt_private_trace_set_environment_entry_integer(
                struct bt_private_trace *priv_trace,
                const char *name, int64_t value)
 {
@@ -355,7 +355,7 @@ void bt_trace_borrow_environment_entry_by_index(
        BT_ASSERT(*name);
 }
 
-void bt_private_trace_borrow_private_environment_entry_by_index(
+void bt_private_trace_borrow_environment_entry_by_index(
                struct bt_private_trace *trace, uint64_t index,
                const char **name, struct bt_private_value **value)
 {
@@ -374,7 +374,7 @@ struct bt_value *bt_trace_borrow_environment_entry_value_by_name(
 }
 
 struct bt_private_value *
-bt_private_trace_borrow_private_environment_entry_value_by_name(
+bt_private_trace_borrow_environment_entry_value_by_name(
                struct bt_private_trace *trace, const char *name)
 {
        return (void *) bt_trace_borrow_environment_entry_value_by_name(
@@ -395,7 +395,7 @@ struct bt_stream *bt_trace_borrow_stream_by_index(
        return g_ptr_array_index(trace->streams, index);
 }
 
-struct bt_private_stream *bt_private_trace_borrow_private_stream_by_index(
+struct bt_private_stream *bt_private_trace_borrow_stream_by_index(
                struct bt_private_trace *trace, uint64_t index)
 {
        return (void *) bt_trace_borrow_stream_by_index((void *) trace, index);
@@ -444,7 +444,7 @@ struct bt_stream_class *bt_trace_borrow_stream_class_by_index(
 }
 
 struct bt_private_stream_class *
-bt_private_trace_borrow_private_stream_class_by_index(
+bt_private_trace_borrow_stream_class_by_index(
                struct bt_private_trace *trace, uint64_t index)
 {
        return (void *) bt_trace_borrow_stream_class_by_index(
@@ -474,7 +474,7 @@ end:
 }
 
 struct bt_private_stream_class *
-bt_private_trace_borrow_private_stream_class_by_id(
+bt_private_trace_borrow_stream_class_by_id(
                struct bt_private_trace *trace, uint64_t id)
 {
        return (void *) bt_trace_borrow_stream_class_by_id((void *) trace, id);
@@ -487,7 +487,7 @@ struct bt_field_class *bt_trace_borrow_packet_header_field_class(
        return trace->packet_header_fc;
 }
 
-int bt_private_trace_set_packet_header_private_field_class(
+int bt_private_trace_set_packet_header_field_class(
                struct bt_private_trace *priv_trace,
                struct bt_private_field_class *priv_field_class)
 {
index eee4998d6e8012b4981d760bb1342cdb6aa724a5..ea2eea785566303e9c6ab399ef55738cf2e80098 100644 (file)
@@ -154,7 +154,7 @@ struct bt_private_field_class *ctf_field_class_struct_to_ir(
 
                member_ir_fc = ctf_field_class_to_ir(named_fc->fc, tc, sc, ec);
                BT_ASSERT(member_ir_fc);
-               ret = bt_private_field_class_structure_append_private_member(
+               ret = bt_private_field_class_structure_append_member(
                        ir_fc, named_fc->name->str, member_ir_fc);
                BT_ASSERT(ret == 0);
                bt_object_put_ref(member_ir_fc);
@@ -196,7 +196,7 @@ struct bt_private_field_class *ctf_field_class_variant_to_ir(
        uint64_t i;
 
        BT_ASSERT(ir_fc);
-       ret = bt_private_field_class_variant_set_selector_private_field_class(
+       ret = bt_private_field_class_variant_set_selector_field_class(
                ir_fc, borrow_ir_ft_from_field_path(&fc->tag_path, tc, sc, ec));
        BT_ASSERT(ret == 0);
 
@@ -267,7 +267,7 @@ struct bt_private_field_class *ctf_field_class_sequence_to_ir(
        BT_ASSERT(ir_fc);
        bt_object_put_ref(elem_ir_fc);
        BT_ASSERT(ir_fc);
-       ret = bt_private_field_class_dynamic_array_set_length_private_field_class(
+       ret = bt_private_field_class_dynamic_array_set_length_field_class(
                ir_fc,
                borrow_ir_ft_from_field_path(&fc->length_path, tc, sc, ec));
        BT_ASSERT(ret == 0);
@@ -405,7 +405,7 @@ struct bt_private_event_class *ctf_event_class_to_ir(struct ctf_event_class *ec,
        struct bt_private_event_class *ir_ec = NULL;
 
        if (ec->is_translated) {
-               ir_ec = bt_private_stream_class_borrow_private_event_class_by_id(
+               ir_ec = bt_private_stream_class_borrow_event_class_by_id(
                        ir_sc, ec->id);
                BT_ASSERT(ir_ec);
                goto end;
@@ -420,7 +420,7 @@ struct bt_private_event_class *ctf_event_class_to_ir(struct ctf_event_class *ec,
                        ec->spec_context_fc, tc, sc, ec);
 
                if (ir_fc) {
-                       ret = bt_private_event_class_set_specific_context_private_field_class(
+                       ret = bt_private_event_class_set_specific_context_field_class(
                                ir_ec, ir_fc);
                        BT_ASSERT(ret == 0);
                        bt_object_put_ref(ir_fc);
@@ -432,7 +432,7 @@ struct bt_private_event_class *ctf_event_class_to_ir(struct ctf_event_class *ec,
                        ec->payload_fc, tc, sc, ec);
 
                if (ir_fc) {
-                       ret = bt_private_event_class_set_payload_private_field_class(ir_ec,
+                       ret = bt_private_event_class_set_payload_field_class(ir_ec,
                                ir_fc);
                        BT_ASSERT(ret == 0);
                        bt_object_put_ref(ir_fc);
@@ -471,7 +471,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class *
        struct ctf_field_class_int *int_fc;
 
        if (sc->is_translated) {
-               ir_sc = bt_private_trace_borrow_private_stream_class_by_id(
+               ir_sc = bt_private_trace_borrow_stream_class_by_id(
                        ir_trace, sc->id);
                BT_ASSERT(ir_sc);
                goto end;
@@ -486,7 +486,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class *
                        sc->packet_context_fc, tc, sc, NULL);
 
                if (ir_fc) {
-                       ret = bt_private_stream_class_set_packet_context_private_field_class(
+                       ret = bt_private_stream_class_set_packet_context_field_class(
                                ir_sc, ir_fc);
                        BT_ASSERT(ret == 0);
                        bt_object_put_ref(ir_fc);
@@ -498,7 +498,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class *
                        sc->event_header_fc, tc, sc, NULL);
 
                if (ir_fc) {
-                       ret = bt_private_stream_class_set_event_header_private_field_class(
+                       ret = bt_private_stream_class_set_event_header_field_class(
                                ir_sc, ir_fc);
                        BT_ASSERT(ret == 0);
                        bt_object_put_ref(ir_fc);
@@ -510,7 +510,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class *
                        sc->event_common_context_fc, tc, sc, NULL);
 
                if (ir_fc) {
-                       ret = bt_private_stream_class_set_event_common_context_private_field_class(
+                       ret = bt_private_stream_class_set_event_common_context_field_class(
                                ir_sc, ir_fc);
                        BT_ASSERT(ret == 0);
                        bt_object_put_ref(ir_fc);
@@ -592,7 +592,7 @@ int ctf_trace_class_to_ir(struct bt_private_trace *ir_trace,
                        tc->packet_header_fc, tc, NULL, NULL);
 
                if (ir_fc) {
-                       ret = bt_private_trace_set_packet_header_private_field_class(
+                       ret = bt_private_trace_set_packet_header_field_class(
                                ir_trace, ir_fc);
                        BT_ASSERT(ret == 0);
                        bt_object_put_ref(ir_fc);
@@ -619,12 +619,12 @@ int ctf_trace_class_to_ir(struct bt_private_trace *ir_trace,
 
                switch (env_entry->type) {
                case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT:
-                       ret = bt_private_trace_set_private_environment_entry_integer(
+                       ret = bt_private_trace_set_environment_entry_integer(
                                ir_trace, env_entry->name->str,
                                env_entry->value.i);
                        break;
                case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_STR:
-                       ret = bt_private_trace_set_private_environment_entry_string(
+                       ret = bt_private_trace_set_environment_entry_string(
                                ir_trace, env_entry->name->str,
                                env_entry->value.str->str);
                        break;
index cc1707ea7bff6a4f2ffbecf976a448e5e8ab0cc0..3fc618b94883d852b613296eaed182d03516e10b 100644 (file)
@@ -691,7 +691,7 @@ enum bt_notif_iter_status read_packet_header_begin_state(
                }
 
                notit->dscopes.trace_packet_header =
-                       bt_private_packet_header_field_borrow_private_field(
+                       bt_private_packet_header_field_borrow_field(
                                notit->packet_header_field);
                BT_ASSERT(notit->dscopes.trace_packet_header);
        }
@@ -927,7 +927,7 @@ enum bt_notif_iter_status read_packet_context_begin_state(
                }
 
                notit->dscopes.stream_packet_context =
-                       bt_private_packet_context_field_borrow_private_field(
+                       bt_private_packet_context_field_borrow_field(
                                notit->packet_context_field);
                BT_ASSERT(notit->dscopes.stream_packet_context);
        }
@@ -1105,7 +1105,7 @@ enum bt_notif_iter_status read_event_header_begin_state(
                }
 
                notit->dscopes.event_header =
-                       bt_private_event_header_field_borrow_private_field(
+                       bt_private_event_header_field_borrow_field(
                                notit->event_header_field);
                BT_ASSERT(notit->dscopes.event_header);
        }
@@ -1247,7 +1247,7 @@ enum bt_notif_iter_status after_event_header_state(
                goto end;
        }
 
-       notit->event = bt_private_notification_event_borrow_private_event(
+       notit->event = bt_private_notification_event_borrow_event(
                notit->event_notif);
        BT_ASSERT(notit->event);
 
@@ -1255,7 +1255,7 @@ enum bt_notif_iter_status after_event_header_state(
                int ret;
 
                BT_ASSERT(notit->event);
-               ret = bt_private_event_move_private_header_field(notit->event,
+               ret = bt_private_event_move_header_field(notit->event,
                        notit->event_header_field);
                if (ret) {
                        status = BT_NOTIF_ITER_STATUS_ERROR;
@@ -1269,7 +1269,7 @@ enum bt_notif_iter_status after_event_header_state(
                 * the same value as the event header field within
                 * notit->event.
                 */
-               BT_ASSERT(bt_private_event_borrow_header_private_field(
+               BT_ASSERT(bt_private_event_borrow_header_field(
                        notit->event) == notit->dscopes.event_header);
        }
 
@@ -1295,7 +1295,7 @@ enum bt_notif_iter_status read_event_common_context_begin_state(
        if (event_common_context_fc->in_ir) {
                BT_ASSERT(!notit->dscopes.event_common_context);
                notit->dscopes.event_common_context =
-                       bt_private_event_borrow_common_context_private_field(
+                       bt_private_event_borrow_common_context_field(
                                notit->event);
                BT_ASSERT(notit->dscopes.event_common_context);
        }
@@ -1348,7 +1348,7 @@ enum bt_notif_iter_status read_event_spec_context_begin_state(
        if (event_spec_context_fc->in_ir) {
                BT_ASSERT(!notit->dscopes.event_spec_context);
                notit->dscopes.event_spec_context =
-                       bt_private_event_borrow_specific_context_private_field(
+                       bt_private_event_borrow_specific_context_field(
                                notit->event);
                BT_ASSERT(notit->dscopes.event_spec_context);
        }
@@ -1404,7 +1404,7 @@ enum bt_notif_iter_status read_event_payload_begin_state(
        if (event_payload_fc->in_ir) {
                BT_ASSERT(!notit->dscopes.event_payload);
                notit->dscopes.event_payload =
-                       bt_private_event_borrow_payload_private_field(
+                       bt_private_event_borrow_payload_field(
                                notit->event);
                BT_ASSERT(notit->dscopes.event_payload);
        }
@@ -1690,7 +1690,7 @@ struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit)
        index = stack_top(notit->stack)->index;
        base_field = stack_top(notit->stack)->base;
        BT_ASSERT(base_field);
-       base_fc = bt_private_field_borrow_private_class(base_field);
+       base_fc = bt_private_field_borrow_class(base_field);
        BT_ASSERT(base_fc);
 
        switch (bt_field_class_get_type(bt_field_class_borrow_from_private(base_fc))) {
@@ -1699,10 +1699,10 @@ struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit)
                BT_ASSERT(index <
                        bt_field_class_structure_get_member_count(
                                bt_field_class_borrow_from_private(
-                                       bt_private_field_borrow_private_class(
+                                       bt_private_field_borrow_class(
                                                base_field))));
                next_field =
-                       bt_private_field_structure_borrow_member_private_field_by_index(
+                       bt_private_field_structure_borrow_member_field_by_index(
                                base_field, index);
                break;
        }
@@ -1710,12 +1710,12 @@ struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit)
        case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
                BT_ASSERT(index < bt_field_array_get_length(
                        bt_field_borrow_from_private(base_field)));
-               next_field = bt_private_field_array_borrow_element_private_field_by_index(
+               next_field = bt_private_field_array_borrow_element_field_by_index(
                        base_field, index);
                break;
        case BT_FIELD_CLASS_TYPE_VARIANT:
                BT_ASSERT(index == 0);
-               next_field = bt_private_field_variant_borrow_selected_option_private_field(
+               next_field = bt_private_field_variant_borrow_selected_option_field(
                        base_field);
                break;
        default:
@@ -1843,7 +1843,7 @@ update_def_clock:
 
        field = borrow_next_field(notit);
        BT_ASSERT(field);
-       BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc);
+       BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
        BT_ASSERT(bt_field_get_class_type(
                bt_field_borrow_from_private(field)) ==
                BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
@@ -1934,7 +1934,7 @@ enum bt_bfcr_status bfcr_signed_int_cb(int64_t value,
 
        field = borrow_next_field(notit);
        BT_ASSERT(field);
-       BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc);
+       BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
        BT_ASSERT(bt_field_get_class_type(
                bt_field_borrow_from_private(field)) ==
                BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
@@ -1962,7 +1962,7 @@ enum bt_bfcr_status bfcr_floating_point_cb(double value,
        BT_ASSERT(fc->in_ir);
        field = borrow_next_field(notit);
        BT_ASSERT(field);
-       BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc);
+       BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
        BT_ASSERT(bt_field_get_class_type(
                bt_field_borrow_from_private(field)) ==
                BT_FIELD_CLASS_TYPE_REAL);
@@ -1987,7 +1987,7 @@ enum bt_bfcr_status bfcr_string_begin_cb(
        BT_ASSERT(fc->in_ir);
        field = borrow_next_field(notit);
        BT_ASSERT(field);
-       BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc);
+       BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
        BT_ASSERT(bt_field_get_class_type(
                bt_field_borrow_from_private(field)) ==
                BT_FIELD_CLASS_TYPE_STRING);
@@ -2081,7 +2081,7 @@ enum bt_bfcr_status bfcr_compound_begin_cb(
 
        /* Push field */
        BT_ASSERT(field);
-       BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc);
+       BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
        stack_push(notit->stack, field);
 
        /*
@@ -2125,7 +2125,7 @@ enum bt_bfcr_status bfcr_compound_end_cb(
        }
 
        BT_ASSERT(!stack_empty(notit->stack));
-       BT_ASSERT(bt_private_field_borrow_private_class(stack_top(notit->stack)->base) ==
+       BT_ASSERT(bt_private_field_borrow_class(stack_top(notit->stack)->base) ==
                fc->ir_fc);
 
        /*
@@ -2243,7 +2243,7 @@ struct ctf_field_class *bfcr_borrow_variant_selected_field_class_cb(
        if (selected_option->fc->in_ir) {
                struct bt_private_field *var_field = stack_top(notit->stack)->base;
 
-               ret = bt_private_field_variant_select_option_private_field(
+               ret = bt_private_field_variant_select_option_field(
                        var_field, option_index);
                if (ret) {
                        BT_LOGW("Cannot select variant field's option field: "
@@ -2264,7 +2264,7 @@ static
 void set_event_default_clock_value(struct bt_notif_iter *notit)
 {
        struct bt_private_event *event =
-               bt_private_notification_event_borrow_private_event(
+               bt_private_notification_event_borrow_event(
                        notit->event_notif);
        struct bt_stream_class *sc = bt_stream_class_borrow_from_private(
                notit->meta.sc->ir_sc);
@@ -2378,7 +2378,7 @@ void notify_new_packet(struct bt_notif_iter *notit,
        }
 
        if (notit->packet_header_field) {
-               ret = bt_private_packet_move_private_header_field(
+               ret = bt_private_packet_move_header_field(
                        notit->packet, notit->packet_header_field);
                if (ret) {
                        goto end;
@@ -2391,13 +2391,13 @@ void notify_new_packet(struct bt_notif_iter *notit,
                 * the same value as the packet header field within
                 * notit->packet.
                 */
-               BT_ASSERT(bt_private_packet_borrow_header_private_field(
+               BT_ASSERT(bt_private_packet_borrow_header_field(
                        notit->packet) ==
                        notit->dscopes.trace_packet_header);
        }
 
        if (notit->packet_context_field) {
-               ret = bt_private_packet_move_private_context_field(
+               ret = bt_private_packet_move_context_field(
                        notit->packet, notit->packet_context_field);
                if (ret) {
                        goto end;
@@ -2410,7 +2410,7 @@ void notify_new_packet(struct bt_notif_iter *notit,
                 * the same value as the packet header field within
                 * notit->packet.
                 */
-               BT_ASSERT(bt_private_packet_borrow_context_private_field(
+               BT_ASSERT(bt_private_packet_borrow_context_field(
                        notit->packet) ==
                        notit->dscopes.stream_packet_context);
        }
index d9166834e02580495e62fc353f2e1a5d37294c92..ccd57fdd0709bd90a9f044a67a4a3d8749c717c5 100644 (file)
@@ -210,7 +210,7 @@ void writer_component_port_connected(
        writer = bt_private_component_get_user_data(component);
        BT_ASSERT(writer);
        BT_ASSERT(!writer->input_iterator);
-       connection = bt_private_port_get_private_connection(self_port);
+       connection = bt_private_port_get_connection(self_port);
        BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &writer->input_iterator);
@@ -305,7 +305,7 @@ enum bt_component_status writer_component_init(
                goto end;
        }
 
-       ret = bt_private_component_sink_add_input_private_port(component,
+       ret = bt_private_component_sink_add_input_port(component,
                "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
index 1e4356d66cc32009deae9fc917479eb8088981fe..d47e18b8d9384c043adfa6b5cfbe503e31b4604a 100644 (file)
@@ -181,7 +181,7 @@ struct bt_private_stream *medop_borrow_stream(
        struct bt_private_stream_class *ds_file_stream_class;
        struct bt_private_stream *stream = NULL;
 
-       ds_file_stream_class = bt_private_stream_borrow_private_class(
+       ds_file_stream_class = bt_private_stream_borrow_class(
                ds_file->stream);
 
        if (stream_class != ds_file_stream_class) {
index e3fa27e7e4b6f08887a77fcc1a39c9ae903a4aa6..2324095238eb303fdaa34a19c5dec7a842745ef6 100644 (file)
@@ -414,7 +414,7 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
 
        port_data->ctf_fs = ctf_fs;
        port_data->ds_file_group = ds_file_group;
-       ret = bt_private_component_source_add_output_private_port(
+       ret = bt_private_component_source_add_output_port(
                ctf_fs->priv_comp, port_name->str, port_data, NULL);
        if (ret) {
                goto error;
index 1f0b84468404377553c7a7cf405a020653ab886c..833c2ab62a4f7be8378dbd8c67276812e9219bf9 100644 (file)
@@ -113,7 +113,7 @@ int lttng_live_add_port(struct lttng_live_component *lttng_live,
        if (lttng_live_is_canceled(lttng_live)) {
                return 0;
        }
-       status = bt_private_component_source_add_output_private_port(
+       status = bt_private_component_source_add_output_port(
                        lttng_live->private_component, name, stream_iter,
                        &private_port);
        switch (status) {
@@ -163,7 +163,7 @@ int lttng_live_remove_port(struct lttng_live_component *lttng_live,
                if (lttng_live_is_canceled(lttng_live)) {
                        return 0;
                }
-               status = bt_private_component_source_add_output_private_port(lttng_live->private_component,
+               status = bt_private_component_source_add_output_port(lttng_live->private_component,
                                "no-stream", lttng_live->no_stream_iter,
                                &lttng_live->no_stream_port);
                switch (status) {
@@ -1128,7 +1128,7 @@ enum bt_component_status lttng_live_component_init(
        if (lttng_live_is_canceled(lttng_live)) {
                goto end;
        }
-       ret = bt_private_component_source_add_output_private_port(
+       ret = bt_private_component_source_add_output_port(
                                lttng_live->private_component, "no-stream",
                                lttng_live->no_stream_iter,
                                &lttng_live->no_stream_port);
index f6ec53d3ba03696739e3a0c18a31750b2816be63..d107b32272c4b342e8cc546ba2bece35124f89cb 100644 (file)
@@ -285,14 +285,14 @@ enum bt_notification_iterator_status debug_info_iterator_init(
                goto end;
        }
 
-       input_port = bt_private_component_filter_get_input_private_port_by_name(
+       input_port = bt_private_component_filter_get_input_port_by_name(
                        component, "in");
        if (!input_port) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
                goto end;
        }
 
-       connection = bt_private_port_get_private_connection(input_port);
+       connection = bt_private_port_get_connection(input_port);
        bt_object_put_ref(input_port);
        if (!connection) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
@@ -413,13 +413,13 @@ enum bt_component_status debug_info_component_init(
                goto error;
        }
 
-       ret = bt_private_component_filter_add_input_private_port(
+       ret = bt_private_component_filter_add_input_port(
                component, "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
        }
 
-       ret = bt_private_component_filter_add_output_private_port(
+       ret = bt_private_component_filter_add_output_port(
                component, "out", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
index 964ad83104e08cd528f5e0dcbb82ff92894c450e..6ea9af0de14aae05c7f814654f20155258eea0e5 100644 (file)
@@ -95,7 +95,7 @@ struct bt_private_field_class *create_event_payload_fc(void)
                goto error;
        }
 
-       ret = bt_private_field_class_structure_append_private_member(root_fc,
+       ret = bt_private_field_class_structure_append_member(root_fc,
                "str", fc);
        if (ret) {
                BT_LOGE("Cannot add `str` member to structure field class: "
@@ -190,7 +190,7 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
                goto error;
        }
 
-       ret = bt_private_event_class_set_payload_private_field_class(dmesg_comp->event_class, fc);
+       ret = bt_private_event_class_set_payload_field_class(dmesg_comp->event_class, fc);
        if (ret) {
                BT_LOGE_STR("Cannot set event class's event payload field class.");
                goto error;
@@ -353,7 +353,7 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
 static
 enum bt_component_status create_port(struct bt_private_component *priv_comp)
 {
-       return bt_private_component_source_add_output_private_port(priv_comp,
+       return bt_private_component_source_add_output_port(priv_comp,
                "out", NULL, NULL);
 }
 
@@ -502,7 +502,7 @@ skip_ts:
                goto error;
        }
 
-       event = bt_private_notification_event_borrow_private_event(notif);
+       event = bt_private_notification_event_borrow_event(notif);
        BT_ASSERT(event);
 
        if (dmesg_comp->clock_class) {
@@ -528,9 +528,9 @@ int fill_event_payload_from_line(const char *line,
        size_t len;
        int ret;
 
-       ep_field = bt_private_event_borrow_payload_private_field(event);
+       ep_field = bt_private_event_borrow_payload_field(event);
        BT_ASSERT(ep_field);
-       str_field = bt_private_field_structure_borrow_member_private_field_by_index(
+       str_field = bt_private_field_structure_borrow_member_field_by_index(
                ep_field, 0);
        if (!str_field) {
                BT_LOGE_STR("Cannot borrow `timestamp` field from event payload structure field.");
@@ -581,7 +581,7 @@ struct bt_private_notification *create_notif_from_line(
                goto error;
        }
 
-       event = bt_private_notification_event_borrow_private_event(notif);
+       event = bt_private_notification_event_borrow_event(notif);
        BT_ASSERT(event);
        ret = fill_event_payload_from_line(new_start, event);
        if (ret) {
index 5ef2c7a70ee6af84b119e27d6dec2877c2c5a390..66534b58c36f42f31aea2db7de4b2f60b5587295 100644 (file)
@@ -164,7 +164,7 @@ enum bt_component_status pretty_port_connected(
        pretty = bt_private_component_get_user_data(component);
        BT_ASSERT(pretty);
        BT_ASSERT(!pretty->input_iterator);
-       connection = bt_private_port_get_private_connection(self_port);
+       connection = bt_private_port_get_connection(self_port);
        BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &pretty->input_iterator);
@@ -716,7 +716,7 @@ enum bt_component_status pretty_init(
                goto end;
        }
 
-       ret = bt_private_component_sink_add_input_private_port(component,
+       ret = bt_private_component_sink_add_input_port(component,
                "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
index 0c2cd3cf14565d6c6720cdde78ca386a54217df7..04450d65a42e7ecca2d9aa12dc8d1bbe27ca728d 100644 (file)
@@ -132,7 +132,7 @@ enum bt_component_status counter_init(struct bt_private_component *component,
                goto end;
        }
 
-       ret = bt_private_component_sink_add_input_private_port(component,
+       ret = bt_private_component_sink_add_input_port(component,
                "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
@@ -185,7 +185,7 @@ enum bt_component_status counter_port_connected(
 
        counter = bt_private_component_get_user_data(component);
        BT_ASSERT(counter);
-       connection = bt_private_port_get_private_connection(self_port);
+       connection = bt_private_port_get_connection(self_port);
        BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &iterator);
index 3e98d5ce552d705150ad5ee5777b66f6247a6283..31d1b70db2d83b2ec41c1b933968631ee8bcebda 100644 (file)
@@ -53,7 +53,7 @@ enum bt_component_status dummy_init(struct bt_private_component *component,
                goto end;
        }
 
-       ret = bt_private_component_sink_add_input_private_port(component,
+       ret = bt_private_component_sink_add_input_port(component,
                "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
@@ -86,7 +86,7 @@ enum bt_component_status dummy_port_connected(
 
        dummy = bt_private_component_get_user_data(component);
        BT_ASSERT(dummy);
-       connection = bt_private_port_get_private_connection(self_port);
+       connection = bt_private_port_get_connection(self_port);
        BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &iterator);
index 8275f3e4f660e91f14e81f2613866b2be225f5bc..1cd3fd51930a46ae46d6b4f20024cb2680ccb95d 100644 (file)
@@ -193,7 +193,7 @@ enum bt_component_status ensure_available_input_port(
        }
 
        g_string_append_printf(port_name, "%u", muxer_comp->next_port_num);
-       status = bt_private_component_filter_add_input_private_port(
+       status = bt_private_component_filter_add_input_port(
                priv_comp, port_name->str, NULL, NULL);
        if (status != BT_COMPONENT_STATUS_OK) {
                BT_LOGE("Cannot add input port to muxer component: "
@@ -220,7 +220,7 @@ static
 enum bt_component_status create_output_port(
                struct bt_private_component *priv_comp)
 {
-       return bt_private_component_filter_add_output_private_port(
+       return bt_private_component_filter_add_output_port(
                priv_comp, "out", NULL, NULL);
 }
 
@@ -421,7 +421,7 @@ struct bt_notification_iterator *create_notif_iter_on_input_port(
        *ret = 0;
        BT_ASSERT(port);
        BT_ASSERT(bt_port_is_connected(port));
-       priv_conn = bt_private_port_get_private_connection(priv_port);
+       priv_conn = bt_private_port_get_connection(priv_port);
        BT_ASSERT(priv_conn);
 
        // TODO: Advance the iterator to >= the time of the latest
@@ -1187,7 +1187,7 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp,
 
        for (i = 0; i < count; i++) {
                struct bt_private_port *priv_port =
-                       bt_private_component_filter_get_input_private_port_by_index(
+                       bt_private_component_filter_get_input_port_by_index(
                                muxer_comp->priv_comp, i);
                struct bt_port *port;
 
index e23daa641280831e4f09306ec8da6fb9edcb8b03..f157de817031c3713c6c9d6e22fb4824a59a4eb4 100644 (file)
@@ -84,10 +84,10 @@ enum bt_notification_iterator_status trimmer_iterator_init(
        }
 
        /* Create a new iterator on the upstream component. */
-       input_port = bt_private_component_filter_get_input_private_port_by_name(
+       input_port = bt_private_component_filter_get_input_port_by_name(
                component, "in");
        BT_ASSERT(input_port);
-       connection = bt_private_port_get_private_connection(input_port);
+       connection = bt_private_port_get_connection(input_port);
        BT_ASSERT(connection);
 
        conn_status = bt_private_connection_create_notification_iterator(connection,
index 777b14fac3c74f2d4a077968c4a288401a886d0e..0aa747583c4154c49e2236a7ca08368ad922b936 100644 (file)
@@ -357,13 +357,13 @@ enum bt_component_status trimmer_component_init(
        }
 
        /* Create input and output ports */
-       ret = bt_private_component_filter_add_input_private_port(
+       ret = bt_private_component_filter_add_input_port(
                component, "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
        }
 
-       ret = bt_private_component_filter_add_output_private_port(
+       ret = bt_private_component_filter_add_output_port(
                component, "out", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
index 606decdf411d69aa87b4c62d7869635d139a54cb..828b11a41e5b75482729f639a1e6af71321b7057 100644 (file)
@@ -495,7 +495,7 @@ enum bt_component_status src_init(
 {
        int ret;
 
-       ret = bt_private_component_source_add_output_private_port(
+       ret = bt_private_component_source_add_output_port(
                private_component, "out", NULL, NULL);
        BT_ASSERT(ret == 0);
        return BT_COMPONENT_STATUS_OK;
@@ -647,7 +647,7 @@ enum bt_component_status sink_port_connected(
                struct bt_port *other_port)
 {
        struct bt_private_connection *priv_conn =
-               bt_private_port_get_private_connection(self_private_port);
+               bt_private_port_get_connection(self_private_port);
        struct sink_user_data *user_data = bt_private_component_get_user_data(
                private_component);
        enum bt_connection_status conn_status;
@@ -673,7 +673,7 @@ enum bt_component_status sink_init(
        ret = bt_private_component_set_user_data(private_component,
                user_data);
        BT_ASSERT(ret == 0);
-       ret = bt_private_component_sink_add_input_private_port(
+       ret = bt_private_component_sink_add_input_port(
                private_component, "in", NULL, NULL);
        BT_ASSERT(ret == 0);
        return BT_COMPONENT_STATUS_OK;
index bb29db0b1a5a9eac4d5fb4dcbcc2eff5f27ee88c..b57d644fce9be9d67676b02c591575e3eb3f407d 100644 (file)
@@ -336,7 +336,7 @@ enum bt_component_status src_port_connected(
 
        switch (current_test) {
        case TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED:
-               ret = bt_private_component_source_add_output_private_port(
+               ret = bt_private_component_source_add_output_port(
                        private_component, "hello", NULL, NULL);
                BT_ASSERT(ret == 0);
                break;
@@ -379,7 +379,7 @@ enum bt_component_status src_init(struct bt_private_component *priv_comp,
 {
        int ret;
 
-       ret = bt_private_component_source_add_output_private_port(
+       ret = bt_private_component_source_add_output_port(
                priv_comp, "out", NULL, NULL);
        BT_ASSERT(ret == 0);
        return BT_COMPONENT_STATUS_OK;
@@ -395,7 +395,7 @@ enum bt_component_status sink_consume(
        switch (current_test) {
        case TEST_SINK_REMOVES_PORT_IN_CONSUME:
        case TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT:
-               def_port = bt_private_component_sink_get_input_private_port_by_name(
+               def_port = bt_private_component_sink_get_input_port_by_name(
                        priv_component, "in");
                BT_ASSERT(def_port);
                ret = bt_private_port_remove_from_component(def_port);
@@ -454,7 +454,7 @@ enum bt_component_status sink_init(struct bt_private_component *priv_comp,
 {
        int ret;
 
-       ret = bt_private_component_sink_add_input_private_port(priv_comp,
+       ret = bt_private_component_sink_add_input_port(priv_comp,
                "in", NULL, NULL);
        BT_ASSERT(ret == 0);
        return BT_COMPONENT_STATUS_OK;
index 47aaeac5e4110562d539248039a17c786d6745cc..9191890e73584d582bca1e80dd5f8314087f198e 100644 (file)
@@ -75,21 +75,21 @@ static struct bt_private_field_class *create_integer_struct(void)
        BT_ASSERT(ui8);
        ret = bt_private_field_class_integer_set_field_value_range(ui8, 8);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(structure,
+       ret = bt_private_field_class_structure_append_member(structure,
                "payload_8", ui8);
        BT_ASSERT(ret == 0);
        ui16 = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(ui16);
        ret = bt_private_field_class_integer_set_field_value_range(ui16, 16);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(structure,
+       ret = bt_private_field_class_structure_append_member(structure,
                "payload_16", ui16);
        BT_ASSERT(ret == 0);
        ui32 = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(ui32);
        ret = bt_private_field_class_integer_set_field_value_range(ui32, 32);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(structure,
+       ret = bt_private_field_class_structure_append_member(structure,
                "payload_32", ui32);
        BT_ASSERT(ret == 0);
        BT_OBJECT_PUT_REF_AND_RESET(ui8);
@@ -147,7 +147,7 @@ static struct bt_private_event_class *create_simple_event(
        BT_ASSERT(ret == 0);
        payload = create_integer_struct();
        BT_ASSERT(payload);
-       ret = bt_private_event_class_set_payload_private_field_class(event, payload);
+       ret = bt_private_event_class_set_payload_field_class(event, payload);
        BT_ASSERT(ret == 0);
        BT_OBJECT_PUT_REF_AND_RESET(payload);
        return event;
@@ -180,10 +180,10 @@ static struct bt_private_event_class *create_complex_event(
        BT_ASSERT(outer);
        inner = create_integer_struct();
        BT_ASSERT(inner);
-       ret = bt_private_field_class_structure_append_private_member(outer,
+       ret = bt_private_field_class_structure_append_member(outer,
                "payload_struct", inner);
        BT_ASSERT(ret == 0);
-       ret = bt_private_event_class_set_payload_private_field_class(event, outer);
+       ret = bt_private_event_class_set_payload_field_class(event, outer);
        BT_ASSERT(ret == 0);
        BT_OBJECT_PUT_REF_AND_RESET(inner);
        BT_OBJECT_PUT_REF_AND_RESET(outer);
@@ -204,7 +204,7 @@ static void set_stream_class_field_classes(
        BT_ASSERT(fc);
        ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(packet_context_type,
+       ret = bt_private_field_class_structure_append_member(packet_context_type,
                "packet_size", fc);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(fc);
@@ -212,7 +212,7 @@ static void set_stream_class_field_classes(
        BT_ASSERT(fc);
        ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(packet_context_type,
+       ret = bt_private_field_class_structure_append_member(packet_context_type,
                "content_size", fc);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(fc);
@@ -222,14 +222,14 @@ static void set_stream_class_field_classes(
        BT_ASSERT(fc);
        ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(event_header_type,
+       ret = bt_private_field_class_structure_append_member(event_header_type,
                "id", fc);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(fc);
-       ret = bt_private_stream_class_set_packet_context_private_field_class(
+       ret = bt_private_stream_class_set_packet_context_field_class(
                stream_class, packet_context_type);
        BT_ASSERT(ret == 0);
-       ret = bt_private_stream_class_set_event_header_private_field_class(
+       ret = bt_private_stream_class_set_event_header_field_class(
                stream_class, event_header_type);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(packet_context_type);
@@ -251,9 +251,9 @@ static void create_sc1(struct bt_private_trace *trace)
        BT_ASSERT(ec1);
        ec2 = create_simple_event(sc1, "ec2");
        BT_ASSERT(ec2);
-       ret_stream = bt_private_event_class_borrow_private_stream_class(ec1);
+       ret_stream = bt_private_event_class_borrow_stream_class(ec1);
        ok(ret_stream == sc1, "Borrow parent stream SC1 from EC1");
-       ret_stream = bt_private_event_class_borrow_private_stream_class(ec2);
+       ret_stream = bt_private_event_class_borrow_stream_class(ec2);
        ok(ret_stream == sc1, "Borrow parent stream SC1 from EC2");
        BT_OBJECT_PUT_REF_AND_RESET(ec1);
        BT_OBJECT_PUT_REF_AND_RESET(ec2);
@@ -272,7 +272,7 @@ static void create_sc2(struct bt_private_trace *trace)
        BT_ASSERT(ret == 0);
        set_stream_class_field_classes(sc2);
        ec3 = create_simple_event(sc2, "ec3");
-       ret_stream = bt_private_event_class_borrow_private_stream_class(ec3);
+       ret_stream = bt_private_event_class_borrow_stream_class(ec3);
        ok(ret_stream == sc2, "Borrow parent stream SC2 from EC3");
        BT_OBJECT_PUT_REF_AND_RESET(ec3);
        BT_OBJECT_PUT_REF_AND_RESET(sc2);
@@ -290,11 +290,11 @@ static void set_trace_packet_header(struct bt_private_trace *trace)
        BT_ASSERT(fc);
        ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
        BT_ASSERT(ret == 0);
-       ret = bt_private_field_class_structure_append_private_member(packet_header_type,
+       ret = bt_private_field_class_structure_append_member(packet_header_type,
                "stream_id", fc);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(fc);
-       ret = bt_private_trace_set_packet_header_private_field_class(trace,
+       ret = bt_private_trace_set_packet_header_field_class(trace,
                packet_header_type);
        BT_ASSERT(ret == 0);
 
@@ -322,11 +322,11 @@ static void init_weak_refs(struct bt_private_trace *tc,
                struct bt_private_event_class **ec3)
 {
        *tc1 = tc;
-       *sc1 = bt_private_trace_borrow_private_stream_class_by_index(tc, 0);
-       *sc2 = bt_private_trace_borrow_private_stream_class_by_index(tc, 1);
-       *ec1 = bt_private_stream_class_borrow_private_event_class_by_index(*sc1, 0);
-       *ec2 = bt_private_stream_class_borrow_private_event_class_by_index(*sc1, 1);
-       *ec3 = bt_private_stream_class_borrow_private_event_class_by_index(*sc2, 0);
+       *sc1 = bt_private_trace_borrow_stream_class_by_index(tc, 0);
+       *sc2 = bt_private_trace_borrow_stream_class_by_index(tc, 1);
+       *ec1 = bt_private_stream_class_borrow_event_class_by_index(*sc1, 0);
+       *ec2 = bt_private_stream_class_borrow_event_class_by_index(*sc1, 1);
+       *ec3 = bt_private_stream_class_borrow_event_class_by_index(*sc2, 0);
 }
 
 static void test_example_scenario(void)
@@ -368,7 +368,7 @@ static void test_example_scenario(void)
 
        /* User A acquires a reference to SC2 from TC1. */
        user_a.sc = bt_object_get_ref(
-               bt_private_trace_borrow_private_stream_class_by_index(
+               bt_private_trace_borrow_stream_class_by_index(
                        user_a.tc, 1));
        ok(user_a.sc, "User A acquires SC2 from TC1");
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
@@ -378,7 +378,7 @@ static void test_example_scenario(void)
 
        /* User A acquires a reference to EC3 from SC2. */
        user_a.ec = bt_object_get_ref(
-               bt_private_stream_class_borrow_private_event_class_by_index(
+               bt_private_stream_class_borrow_event_class_by_index(
                        user_a.sc, 0));
        ok(user_a.ec, "User A acquires EC3 from SC2");
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
@@ -427,7 +427,7 @@ static void test_example_scenario(void)
        /* User C acquires a reference to EC1. */
        diag("User C acquires a reference to EC1");
        user_c.ec = bt_object_get_ref(
-               bt_private_stream_class_borrow_private_event_class_by_index(
+               bt_private_stream_class_borrow_event_class_by_index(
                        user_b.sc, 0));
        ok(bt_object_get_ref_count((void *) weak_ec1) == 1,
                        "EC1 reference count is 1");
This page took 0.06771 seconds and 4 git commands to generate.