Refactoring: context structures

[lttng-ust.git] / liblttng-ust / lttng-context-ip.c

diff --git a/liblttng-ust/lttng-context-ip.c b/liblttng-ust/lttng-context-ip.c
index af4f02acc43b1fb1f389e051d2b54d39659272a9..20c6fef34b8efbf5aa56dea460a4e8e72d6ed4f7 100644 (file)
--- a/liblttng-ust/lttng-context-ip.c
+++ b/liblttng-ust/lttng-context-ip.c
@@ -17,7 +17,7 @@
 #include "context-internal.h"
 
 static
-size_t ip_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t ip_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -27,7 +27,7 @@ size_t ip_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void ip_record(struct lttng_ctx_field *field,
+void ip_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
@@ -38,9 +38,9 @@ void ip_record(struct lttng_ctx_field *field,
        chan->ops->event_write(ctx, &ip, sizeof(ip));
 }
 
-int lttng_add_ip_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_ip_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)
@@ -49,14 +49,14 @@ int lttng_add_ip_to_ctx(struct lttng_ctx **ctx)
                lttng_remove_context_field(ctx, field);
                return -EEXIST;
        }
-       field->event_field.name = "ip";
-       field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.integer.size = sizeof(void *) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(void *) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(void *);
-       field->event_field.type.u.integer.reverse_byte_order = 0;
-       field->event_field.type.u.integer.base = 16;
-       field->event_field.type.u.integer.encoding = lttng_encode_none;
+       field->event_field->name = "ip";
+       field->event_field->type.atype = atype_integer;
+       field->event_field->type.u.integer.size = sizeof(void *) * CHAR_BIT;
+       field->event_field->type.u.integer.alignment = lttng_alignof(void *) * CHAR_BIT;
+       field->event_field->type.u.integer.signedness = lttng_is_signed_type(void *);
+       field->event_field->type.u.integer.reverse_byte_order = 0;
+       field->event_field->type.u.integer.base = 16;
+       field->event_field->type.u.integer.encoding = lttng_encode_none;
        field->get_size = ip_get_size;
        field->record = ip_record;
        lttng_context_update(*ctx);