X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-veuid.c;h=506422e93b8785a722b1ca03c869966b12f69de8;hb=2208d8b5689264e35ed0a660d8c3c82021cc0367;hp=5099d202eb1752db158cc7edc44813cfc6bb950e;hpb=eae3c72949135b48639440468dc78ea1d5e937e9;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-veuid.c b/liblttng-ust/lttng-context-veuid.c
index 5099d202..506422e9 100644
--- a/liblttng-ust/lttng-context-veuid.c
+++ b/liblttng-ust/lttng-context-veuid.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -61,29 +62,29 @@ void lttng_context_veuid_reset(void)
 }
 
 static
-size_t veuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t veuid_get_size(struct lttng_ust_ctx_field *field __attribute__((unused)),
+		size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(uid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uid_t));
 	size += sizeof(uid_t);
 	return size;
 }
 
 static
-void veuid_record(struct lttng_ust_ctx_field *field,
+void veuid_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_ust_channel_buffer *chan)
 {
 	uid_t veuid;
 
 	veuid = get_veuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(veuid));
-	chan->ops->event_write(ctx, &veuid, sizeof(veuid));
+	chan->ops->event_write(ctx, &veuid, sizeof(veuid), lttng_ust_rb_alignof(veuid));
 }
 
 static
-void veuid_get_value(struct lttng_ust_ctx_field *field,
+void veuid_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_veuid();
@@ -96,7 +97,7 @@ int lttng_add_veuid_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
-			lttng_alignof(uid_t) * CHAR_BIT,
+			lttng_ust_rb_alignof(uid_t) * CHAR_BIT,
 			lttng_ust_is_signed_type(uid_t),
 			BYTE_ORDER, 10);
 	if (!type)