X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-export.c;h=0e06dae12e2f15868b40b8e3b250fb9acb7d4416;hb=74a7ebbea3d36158aabbda85d2aeb5a1b3a9daa9;hp=3cf1fc94fef624a75a2dde116c760ab4884935d5;hpb=29ae81fa15c6080fd27929f4cc78e1289cb920e9;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-export.c b/src/afb-export.c
index 3cf1fc94..0e06dae1 100644
--- a/src/afb-export.c
+++ b/src/afb-export.c
@@ -49,6 +49,7 @@
 #include "afb-session.h"
 #include "afb-xreq.h"
 #include "afb-calls.h"
+#include "afb-error-text.h"
 
 #include "systemd.h"
 #include "jobs.h"
@@ -1206,7 +1207,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 +1251,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);
 }
@@ -1818,12 +1819,12 @@ static void api_call_cb(void *closure, struct afb_xreq *xreq)
 		afb_api_v3_process_call(export->desc.v3, xreq);
 		break;
 	default:
-		afb_xreq_reply(xreq, NULL, "bad-api-type", NULL);
+		afb_xreq_reply(xreq, NULL, afb_error_text_internal_error, NULL);
 		break;
 	}
 }
 
-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 +1847,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)