Deprecate internal use of afb_event

[src/app-framework-binder.git] / src / afb-hook.c

diff --git a/src/afb-hook.c b/src/afb-hook.c
index 09e6062..38ecfdc 100644 (file)
--- a/src/afb-hook.c
+++ b/src/afb-hook.c
@@ -28,8 +28,8 @@
 
 #include <json-c/json.h>
 
-#include <afb/afb-req-common.h>
-#include <afb/afb-event-itf.h>
+#include <afb/afb-req.h>
+#include <afb/afb-event.h>
 
 #include "afb-context.h"
 #include "afb-hook.h"
@@ -281,14 +281,14 @@ static void hook_xreq_session_set_LOA_default_cb(void *closure, const struct afb
        _hook_xreq_(xreq, "session_set_LOA(%u) -> %d", level, result);
 }
 
-static void hook_xreq_subscribe_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_subscribe_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_eventid *eventid, int result)
 {
-       _hook_xreq_(xreq, "subscribe(%s:%d) -> %d", afb_evt_event_fullname(event), afb_evt_event_id(event), result);
+       _hook_xreq_(xreq, "subscribe(%s:%d) -> %d", afb_evt_event_fullname(eventid), afb_evt_event_id(eventid), result);
 }
 
-static void hook_xreq_unsubscribe_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_unsubscribe_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_eventid *eventid, int result)
 {
-       _hook_xreq_(xreq, "unsubscribe(%s:%d) -> %d", afb_evt_event_fullname(event), afb_evt_event_id(event), result);
+       _hook_xreq_(xreq, "unsubscribe(%s:%d) -> %d", afb_evt_event_fullname(eventid), afb_evt_event_id(eventid), result);
 }
 
 static void hook_xreq_subcall_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
@@ -480,15 +480,15 @@ int afb_hook_xreq_session_set_LOA(const struct afb_xreq *xreq, unsigned level, i
        return result;
 }
 
-int afb_hook_xreq_subscribe(const struct afb_xreq *xreq, struct afb_event event, int result)
+int afb_hook_xreq_subscribe(const struct afb_xreq *xreq, struct afb_eventid *eventid, int result)
 {
-       _HOOK_XREQ_(subscribe, xreq, event, result);
+       _HOOK_XREQ_(subscribe, xreq, eventid, result);
        return result;
 }
 
-int afb_hook_xreq_unsubscribe(const struct afb_xreq *xreq, struct afb_event event, int result)
+int afb_hook_xreq_unsubscribe(const struct afb_xreq *xreq, struct afb_eventid *eventid, int result)
 {
-       _HOOK_XREQ_(unsubscribe, xreq, event, result);
+       _HOOK_XREQ_(unsubscribe, xreq, eventid, result);
        return result;
 }
 
@@ -724,7 +724,7 @@ static void hook_ditf_vverbose_cb(void *closure, const struct afb_hookid *hookid
        }
 }
 
-static void hook_ditf_event_make_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct afb_event result)
+static void hook_ditf_event_make_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct afb_eventid *result)
 {
        _hook_ditf_(export, "event_make(%s) -> %s:%d", name, afb_evt_event_fullname(result), afb_evt_event_id(result));
 }
@@ -852,7 +852,7 @@ void afb_hook_ditf_vverbose(const struct afb_export *export, int level, const ch
        _HOOK_DITF_(vverbose, export, level, file, line, function, fmt, args);
 }
 
-struct afb_event afb_hook_ditf_event_make(const struct afb_export *export, const char *name, struct afb_event result)
+struct afb_eventid *afb_hook_ditf_event_make(const struct afb_export *export, const char *name, struct afb_eventid *result)
 {
        _HOOK_DITF_(event_make, export, name, result);
        return result;
@@ -1239,11 +1239,6 @@ static void hook_evt_name_default_cb(void *closure, const struct afb_hookid *hoo
        _hook_evt_(evt, id, "name -> %s", result);
 }
 
-static void hook_evt_drop_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
-{
-       _hook_evt_(evt, id, "drop");
-}
-
 static void hook_evt_addref_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
 {
        _hook_evt_(evt, id, "addref");
@@ -1261,7 +1256,6 @@ static struct afb_hook_evt_itf hook_evt_default_itf = {
        .hook_evt_broadcast_before = hook_evt_broadcast_before_default_cb,
        .hook_evt_broadcast_after = hook_evt_broadcast_after_default_cb,
        .hook_evt_name = hook_evt_name_default_cb,
-       .hook_evt_drop = hook_evt_drop_default_cb,
        .hook_evt_addref = hook_evt_addref_default_cb,
        .hook_evt_unref = hook_evt_unref_default_cb
 };
@@ -1318,11 +1312,6 @@ void afb_hook_evt_name(const char *evt, int id, const char *result)
        _HOOK_EVT_(name, evt, id, result);
 }
 
-void afb_hook_evt_drop(const char *evt, int id)
-{
-       _HOOK_EVT_(drop, evt, id);
-}
-
 void afb_hook_evt_addref(const char *evt, int id)
 {
        _HOOK_EVT_(addref, evt, id);