diff options
author | José Bollo <jose.bollo@iot.bzh> | 2018-06-19 20:16:28 +0200 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2018-06-22 09:48:48 +0200 |
commit | 525e9eaa644ca92fad23adfbb7c3119ae8b57a30 (patch) | |
tree | 41de59627ccc937450daf4da6488efd4f4b2f3c2 /bindings/samples/HelloWorld.c | |
parent | 9e15212d26916f59fae2be6d9e618ae9b75a4f40 (diff) |
Improve documentation of api v3
The documentation is improved to reflect the new version.
Tune the options
Change-Id: I894c3db3bc0c10e89db66a9a51a9ad049bb8c0c4
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'bindings/samples/HelloWorld.c')
-rw-r--r-- | bindings/samples/HelloWorld.c | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c index 92d7c4d2..844aa1b2 100644 --- a/bindings/samples/HelloWorld.c +++ b/bindings/samples/HelloWorld.c @@ -282,13 +282,10 @@ static void eventpush (afb_req_t request) json_object_put(object); } -static void callcb (void *prequest, int status, json_object *object, afb_api_t api) +static void callcb (void *prequest, json_object *object, const char *error, const char *info, afb_api_t api) { afb_req_t request = prequest; - if (status < 0) - afb_req_fail(request, "failed", json_object_to_json_string(object)); - else - afb_req_success(request, json_object_get(object), NULL); + afb_req_reply(request, json_object_get(object), error, info); afb_req_unref(request); } @@ -299,31 +296,22 @@ static void call (afb_req_t request) const char *args = afb_req_value(request, "args"); json_object *object = api && verb && args ? json_tokener_parse(args) : NULL; - if (object == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else - afb_service_call(api, verb, object, callcb, afb_req_addref(request)); + afb_service_call(api, verb, object, callcb, afb_req_addref(request)); } static void callsync (afb_req_t request) { - int rc; const char *api = afb_req_value(request, "api"); const char *verb = afb_req_value(request, "verb"); const char *args = afb_req_value(request, "args"); - json_object *result, *object = api && verb && args ? json_tokener_parse(args) : NULL; + json_object *object = api && verb && args ? json_tokener_parse(args) : NULL; + json_object *result; + char *error, *info; - if (object == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else { - rc = afb_service_call_sync(api, verb, object, &result); - if (rc >= 0) - afb_req_success(request, result, NULL); - else { - afb_req_fail(request, "failed", json_object_to_json_string(result)); - json_object_put(result); - } - } + afb_service_call_sync(api, verb, object, &result, &error, &info); + afb_req_reply(request, result, error, info); + free(error); + free(info); } static void verbose (afb_req_t request) |