X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=6215a6845dc3bb77fe01c0e08510450498ad32cd;hb=fb444de0bcb53917086c724444d7f8df25e8e806;hp=a0cdb8a39987a48f9792e165b76323d64a82b74a;hpb=d3cb597b2161a4a7c5494cb570e47b082a80c316;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index a0cdb8a3..6215a684 100644
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -25,8 +25,6 @@
 
 #include <json-c/json.h>
 
-#include <afb/afb-event-itf.h>
-
 #include "afb-wsj1.h"
 #include "afb-ws-json1.h"
 #include "afb-common.h"
@@ -50,7 +48,7 @@ static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid
 
 /* predeclaration of wsreq callbacks */
 static void wsreq_destroy(struct afb_xreq *xreq);
-static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj);
+static void wsreq_reply(struct afb_xreq *xreq, int status, json_object *obj);
 
 /* declaration of websocket structure */
 struct afb_ws_json1
@@ -195,8 +193,8 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
 	afb_wsj1_msg_addref(msg);
 	wsreq->msgj1 = msg;
 	wsreq->xreq.cred = afb_cred_addref(ws->cred);
-	wsreq->xreq.api = api;
-	wsreq->xreq.verb = verb;
+	wsreq->xreq.request.api = api;
+	wsreq->xreq.request.verb = verb;
 	wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
 	wsreq->aws = afb_ws_json1_addref(ws);
 	wsreq->xreq.listener = wsreq->aws->listener;
@@ -229,12 +227,12 @@ static void wsreq_destroy(struct afb_xreq *xreq)
 	free(wsreq);
 }
 
-static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj)
+static void wsreq_reply(struct afb_xreq *xreq, int status, json_object *obj)
 {
 	struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
 	int rc;
 
-	rc = (iserror ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
+	rc = (status < 0 ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
 			wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context));
 	if (rc)
 		ERROR("Can't send reply: %m");