summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
fca2e14)
Change-Id: Ib6c56844312112cc20e2c930f5803d620a9cbafc
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
reply = afb_msg_json_reply(status, info, resp, token, uuid);
reqid = afb_hreq_get_argument(hreq, long_key_for_reqid);
reply = afb_msg_json_reply(status, info, resp, token, uuid);
reqid = afb_hreq_get_argument(hreq, long_key_for_reqid);
- if (reqid != NULL && json_object_object_get_ex(reply, "request", &request)) {
- json_object_object_add (request, long_key_for_reqid, json_object_new_string(reqid));
- } else {
reqid = afb_hreq_get_argument(hreq, short_key_for_reqid);
reqid = afb_hreq_get_argument(hreq, short_key_for_reqid);
- if (reqid != NULL && json_object_object_get_ex(reply, "request", &request)) {
- json_object_object_add (request, short_key_for_reqid, json_object_new_string(reqid));
- }
- }
+ if (reqid != NULL && json_object_object_get_ex(reply, "request", &request))
+ json_object_object_add (request, short_key_for_reqid, json_object_new_string(reqid));
response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string(reply)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
afb_hreq_reply(hreq, retcode, response, NULL);
response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string(reply)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
afb_hreq_reply(hreq, retcode, response, NULL);