X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=774349ac0d806ed37acc7cbffce875fb9be58a64;hb=59d4e6a0654d361de19fbbfa65daf6c1dabd55a0;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..774349ac 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -25,8 +25,6 @@ #include -#include - #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 @@ -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");