From b313067b604bc9a125308a65fdeb098b9d29bff9 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 21 Sep 2023 07:16:49 +0100 Subject: [PATCH] Use side_ptr_t for side_type_null attr pointer Signed-off-by: Mathieu Desnoyers --- include/side/trace.h | 6 +++--- src/tracer.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/side/trace.h b/include/side/trace.h index d63a95e..ac95456 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -283,7 +283,7 @@ struct side_attr { /* Type descriptions */ struct side_type_null { - const struct side_attr *attr; + side_ptr_t(const struct side_attr) attr; uint32_t nr_attr; } SIDE_PACKED; @@ -806,7 +806,7 @@ struct side_event_description { .type = SIDE_TYPE_NULL, \ .u = { \ .side_null = { \ - .attr = SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list()), \ + .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \ .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \ }, \ }, \ @@ -1498,7 +1498,7 @@ struct side_event_description { .u = { \ .side_dynamic = { \ .side_null = { \ - .attr = SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list()), \ + .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \ .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \ }, \ }, \ diff --git a/src/tracer.c b/src/tracer.c index dac7464..5e3157f 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -904,7 +904,8 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg switch (type) { /* Stack-copy basic types */ case SIDE_TYPE_NULL: - tracer_print_type_header(":", type_desc->u.side_null.attr, type_desc->u.side_null.nr_attr); + tracer_print_type_header(":", side_ptr_get(type_desc->u.side_null.attr), + type_desc->u.side_null.nr_attr); printf(""); break; @@ -1657,7 +1658,8 @@ void tracer_print_dynamic(const struct side_arg *item) switch (item->type) { /* Dynamic basic types */ case SIDE_TYPE_DYNAMIC_NULL: - tracer_print_type_header("::", item->u.side_dynamic.side_null.attr, item->u.side_dynamic.side_null.nr_attr); + tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_null.attr), + item->u.side_dynamic.side_null.nr_attr); printf(""); break; case SIDE_TYPE_DYNAMIC_BOOL: -- 2.34.1