Introduce tracer cb typedef

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

diff --git a/include/side/trace.h b/include/side/trace.h
index 830137f9dd9d4c5e70e99179689d78eb616d8128..99faee911aed3855fd707a49e83f0a5f95b71b62 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -1421,27 +1421,25 @@ void side_call_variadic(const struct side_event_description *desc,
        const struct side_arg_vec *side_arg_vec,
        const struct side_arg_dynamic_struct *var_struct);
 
-int side_tracer_callback_register(struct side_event_description *desc,
-               void (*call)(const struct side_event_description *desc,
+typedef void (*side_tracer_callback_func)(const struct side_event_description *desc,
                        const struct side_arg_vec *side_arg_vec,
-                       void *priv),
-               void *priv);
-int side_tracer_callback_variadic_register(struct side_event_description *desc,
-               void (*call_variadic)(const struct side_event_description *desc,
+                       void *priv);
+typedef void (*side_tracer_callback_variadic_func)(const struct side_event_description *desc,
                        const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_struct *var_struct,
-                       void *priv),
+                       void *priv);
+
+int side_tracer_callback_register(struct side_event_description *desc,
+               side_tracer_callback_func call,
+               void *priv);
+int side_tracer_callback_variadic_register(struct side_event_description *desc,
+               side_tracer_callback_variadic_func call_variadic,
                void *priv);
 int side_tracer_callback_unregister(struct side_event_description *desc,
-               void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *side_arg_vec,
-                       void *priv),
+               side_tracer_callback_func call,
                void *priv);
 int side_tracer_callback_variadic_unregister(struct side_event_description *desc,
-               void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *side_arg_vec,
-                       const struct side_arg_dynamic_struct *var_struct,
-                       void *priv),
+               side_tracer_callback_variadic_func call_variadic,
                void *priv);
 
 struct side_events_register_handle *side_events_register(struct side_event_description **events,

diff --git a/src/side.c b/src/side.c
index 5740a07f28c468c25eddc11fdeb2d157c198c512..09cfaf3db98d7aa8f63895c77901ae4bfbda37d2 100644 (file)
--- a/src/side.c
+++ b/src/side.c
@@ -61,7 +61,7 @@ static DEFINE_SIDE_LIST_HEAD(side_tracer_list);
  * The empty callback has a NULL function callback pointer, which stops
  * iteration on the array of callbacks immediately.
  */
-const struct side_callback side_empty_callback;
+const struct side_callback side_empty_callback = { };
 
 void side_init(void) __attribute__((constructor));
 void side_exit(void) __attribute__((destructor));
@@ -132,7 +132,7 @@ const struct side_callback *side_tracer_callback_lookup(
 
 static
 int _side_tracer_callback_register(struct side_event_description *desc,
-               void (*call)(), void *priv)
+               void *call, void *priv)
 {
        struct side_callback *old_cb, *new_cb;
        int ret = SIDE_ERROR_OK;
@@ -182,9 +182,7 @@ unlock:
 }
 
 int side_tracer_callback_register(struct side_event_description *desc,
-               void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *side_arg_vec,
-                       void *priv),
+               side_tracer_callback_func call,
                void *priv)
 {
        if (desc->flags & SIDE_EVENT_FLAG_VARIADIC)
@@ -193,10 +191,7 @@ int side_tracer_callback_register(struct side_event_description *desc,
 }
 
 int side_tracer_callback_variadic_register(struct side_event_description *desc,
-               void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *side_arg_vec,
-                       const struct side_arg_dynamic_struct *var_struct,
-                       void *priv),
+               side_tracer_callback_variadic_func call_variadic,
                void *priv)
 {
        if (!(desc->flags & SIDE_EVENT_FLAG_VARIADIC))
@@ -205,7 +200,7 @@ int side_tracer_callback_variadic_register(struct side_event_description *desc,
 }
 
 int _side_tracer_callback_unregister(struct side_event_description *desc,
-               void (*call)(), void *priv)
+               void *call, void *priv)
 {
        struct side_callback *old_cb, *new_cb;
        const struct side_callback *cb_pos;
@@ -254,9 +249,7 @@ unlock:
 }
 
 int side_tracer_callback_unregister(struct side_event_description *desc,
-               void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *side_arg_vec,
-                       void *priv),
+               side_tracer_callback_func call,
                void *priv)
 {
        if (desc->flags & SIDE_EVENT_FLAG_VARIADIC)
@@ -265,10 +258,7 @@ int side_tracer_callback_unregister(struct side_event_description *desc,
 }
 
 int side_tracer_callback_variadic_unregister(struct side_event_description *desc,
-               void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *side_arg_vec,
-                       const struct side_arg_dynamic_struct *var_struct,
-                       void *priv),
+               side_tracer_callback_variadic_func call_variadic,
                void *priv)
 {
        if (!(desc->flags & SIDE_EVENT_FLAG_VARIADIC))