X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fust-core.c;h=ca44c8f04dd7fa3677d461861b2634286d683ddb;hb=a880bae51b3d8e927f68ceae2804636976bd62d8;hp=281222625c8cd024aedfc4f5c153a60590f397f9;hpb=bb7ad29d1e8a78e4f0f5f9c7f121fd5545c90acb;p=lttng-ust.git

diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index 28122262..ca44c8f0 100644
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -17,7 +17,7 @@
 static CDS_LIST_HEAD(lttng_transport_list);
 static CDS_LIST_HEAD(lttng_counter_transport_list);
 
-struct lttng_transport *lttng_transport_find(const char *name)
+struct lttng_transport *lttng_ust_transport_find(const char *name)
 {
 	struct lttng_transport *transport;
 
@@ -86,8 +86,8 @@ void lttng_counter_transport_unregister(struct lttng_counter_transport *transpor
 /*
  * Needed by comm layer.
  */
-struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
-		const struct lttng_enum_desc *enum_desc)
+struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_ust_session *session,
+		const struct lttng_ust_enum_desc *enum_desc)
 {
 	struct lttng_enum *_enum;
 	struct cds_hlist_head *head;
@@ -96,7 +96,7 @@ struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
 	uint32_t hash;
 
 	hash = jhash(enum_desc->name, name_len, 0);
-	head = &session->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
+	head = &session->priv->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
 	cds_hlist_for_each_entry(_enum, node, head, hlist) {
 		assert(_enum->desc);
 		if (_enum->desc == enum_desc)
@@ -105,7 +105,7 @@ struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
 	return NULL;
 }
 
-size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t lttng_ust_dummy_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -114,7 +114,7 @@ size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset)
 	return size;
 }
 
-void lttng_ust_dummy_record(struct lttng_ctx_field *field,
+void lttng_ust_dummy_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -124,8 +124,8 @@ void lttng_ust_dummy_record(struct lttng_ctx_field *field,
 	chan->ops->event_write(ctx, &sel_char, sizeof(sel_char));
 }
 
-void lttng_ust_dummy_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void lttng_ust_dummy_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->sel = LTTNG_UST_DYNAMIC_TYPE_NONE;
 }