X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-wsj1.c;fp=src%2Fafb-wsj1.c;h=5859bd3682d343eda1c5fa258d6c30c134430ba2;hb=80551a0405e8a208af587b6fff7f784a1a2ffbf4;hp=7f030a0c4de158480a797913b14ac25670565c56;hpb=b57505f0f80f6394f04a041df6e808c857b01d4b;p=src%2Fapp-framework-binder.git diff --git a/src/afb-wsj1.c b/src/afb-wsj1.c index 7f030a0c..5859bd36 100644 --- a/src/afb-wsj1.c +++ b/src/afb-wsj1.c @@ -477,24 +477,14 @@ int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, co return rc; } - -int afb_wsj1_reply_ok_j(struct afb_wsj1_msg *msg, struct json_object *object, const char *token) -{ - return afb_wsj1_reply_ok_s(msg, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN), token); -} - -int afb_wsj1_reply_ok_s(struct afb_wsj1_msg *msg, const char *object, const char *token) -{ - return wsj1_send_isot(msg->wsj1, RETOK, msg->id, object, token); -} - -int afb_wsj1_reply_error_j(struct afb_wsj1_msg *msg, struct json_object *object, const char *token) +int afb_wsj1_reply_j(struct afb_wsj1_msg *msg, struct json_object *object, const char *token, int iserror) { - return afb_wsj1_reply_error_s(msg, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN), token); + const char *objstr = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN); + return afb_wsj1_reply_s(msg, objstr, token, iserror); } -int afb_wsj1_reply_error_s(struct afb_wsj1_msg *msg, const char *object, const char *token) +int afb_wsj1_reply_s(struct afb_wsj1_msg *msg, const char *object, const char *token, int iserror) { - return wsj1_send_isot(msg->wsj1, RETERR, msg->id, object, token); + return wsj1_send_isot(msg->wsj1, iserror ? RETERR : RETOK, msg->id, object, token); }