X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-export.c;h=f96f8f81ef8b5c63065073618bf799932e5dba16;hb=b55f3cd48507105e85894be89557787eccfbe22f;hp=38ef402138f32b31f3eb62c028fe02b7f985d6d0;hpb=6dfeafe7e4fa582b3db3f950136bc97f8611fc6d;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-export.c b/src/afb-export.c
index 38ef4021..f96f8f81 100644
--- a/src/afb-export.c
+++ b/src/afb-export.c
@@ -1206,7 +1206,7 @@ static const struct afb_api_x3_itf hooked_api_x3_itf = {
 /*
  * Propagates the event to the service
  */
-static void listener_of_events(void *closure, const char *event, int eventid, struct json_object *object)
+static void listener_of_events(void *closure, const char *event, uint16_t eventid, struct json_object *object)
 {
 	const struct globset_handler *handler;
 	void (*callback)(void *, const char*, struct json_object*, struct afb_api_x3*);
@@ -1250,7 +1250,7 @@ static void listener_of_events(void *closure, const char *event, int eventid, st
 	json_object_put(object);
 }
 
-static void listener_of_pushed_events(void *closure, const char *event, int eventid, struct json_object *object)
+static void listener_of_pushed_events(void *closure, const char *event, uint16_t eventid, struct json_object *object)
 {
 	listener_of_events(closure, event, eventid, object);
 }
@@ -1823,7 +1823,7 @@ static void api_call_cb(void *closure, struct afb_xreq *xreq)
 	}
 }
 
-static struct json_object *api_describe_cb(void *closure)
+static void api_describe_cb(void *closure, void (*describecb)(void *, struct json_object *), void *clocb)
 {
 	struct afb_export *export = closure;
 	struct json_object *result;
@@ -1846,7 +1846,7 @@ static struct json_object *api_describe_cb(void *closure)
 		result = NULL;
 		break;
 	}
-	return result;
+	describecb(clocb, result);
 }
 
 static int api_service_start_cb(void *closure)
@@ -1952,7 +1952,6 @@ void afb_export_process_xreq(struct afb_export *export, struct afb_xreq *xreq)
 
 void afb_export_context_init(struct afb_export *export, struct afb_context *context)
 {
-	afb_context_init(context, export->session, NULL);
-	context->validated = 1;
+	afb_context_init_validated(context, export->session);
 }