From 6910c28cd9c7313148445698ec5bc5a4fa285ee3 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 21 Sep 2023 10:35:15 +0100 Subject: [PATCH] trace.h: Use side_ptr_t for string_value pointer Signed-off-by: Mathieu Desnoyers --- include/side/trace.h | 8 ++++---- src/tracer.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/side/trace.h b/include/side/trace.h index 76c82b8..22cdec3 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -525,7 +525,7 @@ union side_arg_static { /* Stack-copy basic types */ union side_bool_value bool_value; uint8_t byte_value; - uint64_t string_value; /* const {uint8_t, uint16_t, uint32_t} * */ + side_ptr_t(const void) string_value; /* const {uint8_t, uint16_t, uint32_t} * */ union side_integer_value integer_value; union side_float_value float_value; @@ -1427,9 +1427,9 @@ struct side_event_description { #define side_arg_null(_val) { .type = SIDE_TYPE_NULL } #define side_arg_bool(_val) { .type = SIDE_TYPE_BOOL, .u = { .side_static = { .bool_value = { .side_bool8 = !!(_val) } } } } #define side_arg_byte(_val) { .type = SIDE_TYPE_BYTE, .u = { .side_static = { .byte_value = (_val) } } } -#define side_arg_string(_val) { .type = SIDE_TYPE_STRING_UTF8, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } } -#define side_arg_string16(_val) { .type = SIDE_TYPE_STRING_UTF16, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } } -#define side_arg_string32(_val) { .type = SIDE_TYPE_STRING_UTF32, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } } +#define side_arg_string(_val) { .type = SIDE_TYPE_STRING_UTF8, .u = { .side_static = { .string_value = SIDE_PTR_INIT(_val) } } } +#define side_arg_string16(_val) { .type = SIDE_TYPE_STRING_UTF16, .u = { .side_static = { .string_value = SIDE_PTR_INIT(_val) } } } +#define side_arg_string32(_val) { .type = SIDE_TYPE_STRING_UTF32, .u = { .side_static = { .string_value = SIDE_PTR_INIT(_val) } } } #define side_arg_u8(_val) { .type = SIDE_TYPE_U8, .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } } #define side_arg_u16(_val) { .type = SIDE_TYPE_U16, .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } } diff --git a/src/tracer.c b/src/tracer.c index c7c1cc8..65887fb 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -946,7 +946,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg case SIDE_TYPE_STRING_UTF16: case SIDE_TYPE_STRING_UTF32: tracer_print_type_header(":", side_ptr_get(type_desc->u.side_string.attr), type_desc->u.side_string.nr_attr); - tracer_print_string((const void *)(uintptr_t) item->u.side_static.string_value, + tracer_print_string(side_ptr_get(item->u.side_static.string_value), type_desc->u.side_string.unit_size, type_desc->u.side_string.byte_order, NULL); break; -- 2.34.1