From 55732d44c13bc98c8acff716d66dceea09c2af68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sun, 23 Oct 2016 19:35:36 -0400 Subject: [PATCH] Hide new bt_ctf_packet_* symbols MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- formats/ctf/ir/packet.c | 6 ++++++ include/Makefile.am | 2 +- include/babeltrace/ctf-ir/event.h | 1 - include/babeltrace/ctf-ir/packet.h | 18 ++++++++++++------ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/formats/ctf/ir/packet.c b/formats/ctf/ir/packet.c index 59e193fc..a94d2677 100644 --- a/formats/ctf/ir/packet.c +++ b/formats/ctf/ir/packet.c @@ -36,17 +36,20 @@ #include #include +BT_HIDDEN struct bt_ctf_stream *bt_ctf_packet_get_stream(struct bt_ctf_packet *packet) { return packet ? bt_get(packet->stream) : NULL; } +BT_HIDDEN struct bt_ctf_field *bt_ctf_packet_get_header( struct bt_ctf_packet *packet) { return packet ? bt_get(packet->header) : NULL; } +BT_HIDDEN int bt_ctf_packet_set_header(struct bt_ctf_packet *packet, struct bt_ctf_field *header) { @@ -87,12 +90,14 @@ end: return ret; } +BT_HIDDEN struct bt_ctf_field *bt_ctf_packet_get_context( struct bt_ctf_packet *packet) { return packet ? bt_get(packet->context) : NULL; } +BT_HIDDEN int bt_ctf_packet_set_context(struct bt_ctf_packet *packet, struct bt_ctf_field *context) { @@ -154,6 +159,7 @@ void bt_ctf_packet_destroy(struct bt_object *obj) g_free(packet); } +BT_HIDDEN struct bt_ctf_packet *bt_ctf_packet_create( struct bt_ctf_stream *stream) { diff --git a/include/Makefile.am b/include/Makefile.am index 027f2d32..441d3ba5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -28,7 +28,6 @@ babeltracectfirinclude_HEADERS = \ babeltrace/ctf-ir/event.h \ babeltrace/ctf-ir/event-class.h \ babeltrace/ctf-ir/stream.h \ - babeltrace/ctf-ir/packet.h \ babeltrace/ctf-ir/stream-class.h \ babeltrace/ctf-ir/trace.h \ babeltrace/ctf-ir/utils.h @@ -75,6 +74,7 @@ noinst_HEADERS = \ babeltrace/ctf-ir/trace-internal.h \ babeltrace/ctf-ir/validation-internal.h \ babeltrace/ctf-ir/field-path.h \ + babeltrace/ctf-ir/packet.h \ babeltrace/ctf-writer/functor-internal.h \ babeltrace/trace-handle-internal.h \ babeltrace/compat/uuid.h \ diff --git a/include/babeltrace/ctf-ir/event.h b/include/babeltrace/ctf-ir/event.h index 21db6bc7..421fd11e 100644 --- a/include/babeltrace/ctf-ir/event.h +++ b/include/babeltrace/ctf-ir/event.h @@ -42,7 +42,6 @@ struct bt_ctf_event; struct bt_ctf_field; struct bt_ctf_field_type; struct bt_ctf_stream_class; -struct bt_ctf_packet; /* * bt_ctf_event_create: instanciate an event. diff --git a/include/babeltrace/ctf-ir/packet.h b/include/babeltrace/ctf-ir/packet.h index 40aaab15..5519c3d2 100644 --- a/include/babeltrace/ctf-ir/packet.h +++ b/include/babeltrace/ctf-ir/packet.h @@ -37,22 +37,28 @@ extern "C" { struct bt_ctf_stream; struct bt_ctf_packet; -extern struct bt_ctf_packet *bt_ctf_packet_create( +BT_HIDDEN +struct bt_ctf_packet *bt_ctf_packet_create( struct bt_ctf_stream *stream); -extern struct bt_ctf_stream *bt_ctf_packet_get_stream( +BT_HIDDEN +struct bt_ctf_stream *bt_ctf_packet_get_stream( struct bt_ctf_packet *packet); -extern struct bt_ctf_field *bt_ctf_packet_get_header( +BT_HIDDEN +struct bt_ctf_field *bt_ctf_packet_get_header( struct bt_ctf_packet *packet); -extern int bt_ctf_packet_set_header( +BT_HIDDEN +int bt_ctf_packet_set_header( struct bt_ctf_packet *packet, struct bt_ctf_field *header); -extern struct bt_ctf_field *bt_ctf_packet_get_context( +BT_HIDDEN +struct bt_ctf_field *bt_ctf_packet_get_context( struct bt_ctf_packet *context); -extern int bt_ctf_packet_set_context( +BT_HIDDEN +int bt_ctf_packet_set_context( struct bt_ctf_packet *packet, struct bt_ctf_field *context); #ifdef __cplusplus -- 2.34.1