X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vsgid.c;h=387e931bed2c763b5b8d7075c9d12c3d8c89586e;hb=2208d8b5689264e35ed0a660d8c3c82021cc0367;hp=07a2ccadb756a5c35e71bb615ffbc916ad0411b1;hpb=eae3c72949135b48639440468dc78ea1d5e937e9;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vsgid.c b/liblttng-ust/lttng-context-vsgid.c
index 07a2ccad..387e931b 100644
--- a/liblttng-ust/lttng-context-vsgid.c
+++ b/liblttng-ust/lttng-context-vsgid.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -65,29 +66,29 @@ void lttng_context_vsgid_reset(void)
 }
 
 static
-size_t vsgid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t vsgid_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(gid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(gid_t));
 	size += sizeof(gid_t);
 	return size;
 }
 
 static
-void vsgid_record(struct lttng_ust_ctx_field *field,
+void vsgid_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_ust_channel_buffer *chan)
 {
 	gid_t vsgid;
 
 	vsgid = get_vsgid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsgid));
-	chan->ops->event_write(ctx, &vsgid, sizeof(vsgid));
+	chan->ops->event_write(ctx, &vsgid, sizeof(vsgid), lttng_ust_rb_alignof(vsgid));
 }
 
 static
-void vsgid_get_value(struct lttng_ust_ctx_field *field,
+void vsgid_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_vsgid();
@@ -100,7 +101,7 @@ int lttng_add_vsgid_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(gid_t) * CHAR_BIT,
-			lttng_alignof(gid_t) * CHAR_BIT,
+			lttng_ust_rb_alignof(gid_t) * CHAR_BIT,
 			lttng_ust_is_signed_type(gid_t),
 			BYTE_ORDER, 10);
 	if (!type)