Remove side_dynamic_vla_visitor

Can now use side_visitor instead.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/side/trace.h b/include/side/trace.h
index 1c5a34c4cdb992dbffe45dca3a882cc45de8078e..967572f967df530569c630b09dac7639b64fca2b 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -28,7 +28,6 @@ struct side_type;
 struct side_event_field;
 struct side_tracer_visitor_ctx;
 struct side_tracer_dynamic_struct_visitor_ctx;
-struct side_tracer_dynamic_vla_visitor_ctx;
 struct side_event_description;
 struct side_arg_dynamic_event_struct;
 struct side_events_register_handle;
@@ -191,9 +190,6 @@ typedef enum side_visitor_status (*side_visitor)(
 typedef enum side_visitor_status (*side_dynamic_struct_visitor)(
                const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx,
                void *app_ctx);
-typedef enum side_visitor_status (*side_dynamic_vla_visitor)(
-               const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx,
-               void *app_ctx);
 
 union side_integer_value {
        uint8_t side_u8;
@@ -463,7 +459,7 @@ struct side_arg_dynamic {
        const struct side_arg_dynamic_vla *side_dynamic_vla;
        struct {
                void *app_ctx;
-               side_dynamic_vla_visitor visitor;
+               side_visitor visitor;
                const struct side_attr *attr;
                uint32_t nr_attr;
        } SIDE_PACKED side_dynamic_vla_visitor;
@@ -531,13 +527,6 @@ struct side_tracer_dynamic_struct_visitor_ctx {
        void *priv;             /* Private tracer context. */
 } SIDE_PACKED;
 
-struct side_tracer_dynamic_vla_visitor_ctx {
-       enum side_visitor_status (*write_elem)(
-                       const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx,
-                       const struct side_arg *elem);
-       void *priv;             /* Private tracer context. */
-} SIDE_PACKED;
-
 /* Event and type attributes */
 
 #if SIDE_BITS_PER_LONG == 64

diff --git a/src/test.c b/src/test.c
index a95d78047524a6a4652288df3e9a6c9730f76677..8694ed7ae09265c56b6e00780660de417c22a6b7 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -648,7 +648,7 @@ struct app_dynamic_vla_visitor_ctx {
 };
 
 static
-enum side_visitor_status test_dynamic_vla_visitor(const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx, void *_ctx)
+enum side_visitor_status test_dynamic_vla_visitor(const struct side_tracer_visitor_ctx *tracer_ctx, void *_ctx)
 {
        struct app_dynamic_vla_visitor_ctx *ctx = (struct app_dynamic_vla_visitor_ctx *) _ctx;
        uint32_t length = ctx->length, i;

diff --git a/src/tracer.c b/src/tracer.c
index 42d1edd6ba1b795f190ed9daebb8800e7a605640..0996f66c5dd6d88f366835045409b2633f7314c6 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -1499,7 +1499,7 @@ struct tracer_dynamic_vla_visitor_priv {
 
 static
 enum side_visitor_status tracer_dynamic_vla_write_elem_cb(
-                       const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx,
+                       const struct side_tracer_visitor_ctx *tracer_ctx,
                        const struct side_arg *elem)
 {
        struct tracer_dynamic_vla_visitor_priv *tracer_priv = tracer_ctx->priv;
@@ -1516,7 +1516,7 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg *item)
        struct tracer_dynamic_vla_visitor_priv tracer_priv = {
                .i = 0,
        };
-       const struct side_tracer_dynamic_vla_visitor_ctx tracer_ctx = {
+       const struct side_tracer_visitor_ctx tracer_ctx = {
                .write_elem = tracer_dynamic_vla_write_elem_cb,
                .priv = &tracer_priv,
        };