X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vuid.c;h=754218d269e188421040a925f312d2c2f337b74d;hb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;hp=f4bcb5c90635ac6d739967e52a1cfaed739a4867;hpb=06e646e04714e0e0f7537841107ab0528ef33a52;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vuid.c b/liblttng-ust/lttng-context-vuid.c
index f4bcb5c9..754218d2 100644
--- a/liblttng-ust/lttng-context-vuid.c
+++ b/liblttng-ust/lttng-context-vuid.c
@@ -61,7 +61,7 @@ void lttng_context_vuid_reset(void)
 }
 
 static
-size_t vuid_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t vuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -71,7 +71,7 @@ size_t vuid_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void vuid_record(struct lttng_ctx_field *field,
+void vuid_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -83,15 +83,15 @@ void vuid_record(struct lttng_ctx_field *field,
 }
 
 static
-void vuid_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void vuid_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_vuid();
 }
 
-int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_vuid_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	struct lttng_ust_ctx_field *field;
 
 	field = lttng_append_context(ctx);
 	if (!field)
@@ -100,14 +100,14 @@ int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx)
 		lttng_remove_context_field(ctx, field);
 		return -EEXIST;
 	}
-	field->event_field.name = "vuid";
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.integer.size = sizeof(uid_t) * CHAR_BIT;
-	field->event_field.type.u.integer.alignment = lttng_alignof(uid_t) * CHAR_BIT;
-	field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_t);
-	field->event_field.type.u.integer.reverse_byte_order = 0;
-	field->event_field.type.u.integer.base = 10;
-	field->event_field.type.u.integer.encoding = lttng_encode_none;
+	field->event_field->name = "vuid";
+	field->event_field->type.atype = atype_integer;
+	field->event_field->type.u.integer.size = sizeof(uid_t) * CHAR_BIT;
+	field->event_field->type.u.integer.alignment = lttng_alignof(uid_t) * CHAR_BIT;
+	field->event_field->type.u.integer.signedness = lttng_is_signed_type(uid_t);
+	field->event_field->type.u.integer.reverse_byte_order = 0;
+	field->event_field->type.u.integer.base = 10;
+	field->event_field->type.u.integer.encoding = lttng_encode_none;
 	field->get_size = vuid_get_size;
 	field->record = vuid_record;
 	field->get_value = vuid_get_value;