diff options
author | José Bollo <jose.bollo@iot.bzh> | 2017-07-03 13:57:19 +0200 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2017-07-03 14:13:46 +0200 |
commit | 052c3aee6362b2e33c060e0fbddd68439bb73dcb (patch) | |
tree | acb632eac2bdd273a90fdda5a7982c507b83da9a /src/afb-stub-ws.c | |
parent | 119e23a69678d0d71a81d8460b4bc0099c8c9729 (diff) |
Make status common
Make all error status for bindings use
a common convention: a negative value
means an error.
Change-Id: Id09610051295810f04f00477d7ec1d9771bf7975
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-stub-ws.c')
-rw-r--r-- | src/afb-stub-ws.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c index 1dc19fb4..fa7e4894 100644 --- a/src/afb-stub-ws.c +++ b/src/afb-stub-ws.c @@ -740,11 +740,11 @@ static void client_reply_fail(struct afb_stub_ws *stubws, struct readbuf *rb) } /* send a subcall reply */ -static void client_send_subcall_reply(struct client_subcall *subcall, int iserror, json_object *object) +static void client_send_subcall_reply(struct client_subcall *subcall, int status, json_object *object) { int rc; struct writebuf wb = { .count = 0 }; - char ie = (char)!!iserror; + char ie = status < 0; if (!writebuf_char(&wb, CHAR_FOR_SUBCALL_REPLY) || !writebuf_uint32(&wb, subcall->subcallid) @@ -761,9 +761,9 @@ static void client_send_subcall_reply(struct client_subcall *subcall, int iserro } /* callback for subcall reply */ -static void client_subcall_reply_cb(void *closure, int iserror, json_object *object) +static void client_subcall_reply_cb(void *closure, int status, json_object *object) { - client_send_subcall_reply(closure, iserror, object); + client_send_subcall_reply(closure, status, object); free(closure); } @@ -1040,14 +1040,14 @@ overflow: /* on subcall reply */ static void server_on_subcall_reply(struct afb_stub_ws *stubws, struct readbuf *rb) { - char iserror; + char ie; uint32_t subcallid; struct json_object *object; struct server_subcall *sc, **psc; /* reads the call message data */ if (!readbuf_uint32(rb, &subcallid) - || !readbuf_char(rb, &iserror) + || !readbuf_char(rb, &ie) || !readbuf_object(rb, &object)) { /* TODO bad protocol */ return; @@ -1064,7 +1064,7 @@ static void server_on_subcall_reply(struct afb_stub_ws *stubws, struct readbuf * } else { *psc = sc->next; pthread_mutex_unlock(&stubws->mutex); - sc->callback(sc->closure, (int)iserror, object); + sc->callback(sc->closure, -(int)ie, object); free(sc); } json_object_put(object); |