/******************************************************************************/
-static inline struct afb_req to_req(struct afb_xreq *xreq)
-{
- return (struct afb_req){ .itf = xreq->request.itf, .closure = &xreq->request };
-}
-
-/******************************************************************************/
-
struct subcall
{
struct afb_xreq xreq;
static void subcall_req_on_reply(struct subcall *subcall, int status, struct json_object *result)
{
- subcall->callback_req(subcall->closure, status, result, to_req(subcall->xreq.caller));
+ subcall->callback_req(subcall->closure, status, result, xreq_to_req(subcall->xreq.caller));
}
static void subcall_request_on_reply(struct subcall *subcall, int status, struct json_object *result)
sc = subcall_alloc(xreq, api, verb, args);
if (sc == NULL) {
if (callback)
- callback(cb_closure, 1, afb_msg_json_internal_error(), to_req(xreq));
+ callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_req(xreq));
json_object_put(args);
} else {
subcall_req(sc, callback, cb_closure);
sc = subcall_alloc(xreq, api, verb, args);
if (sc == NULL) {
if (callback)
- callback(cb_closure, 1, afb_msg_json_internal_error(), to_req(xreq));
+ callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_req(xreq));
json_object_put(args);
} else {
subcall_req_hooked(sc, callback, cb_closure);
struct afb_xreq *xreq = (struct afb_xreq *)sreq;
if (xreq->hookflags)
afb_hook_xreq_unstore(xreq);
- return to_req(xreq);
+ return xreq_to_req(xreq);
}
struct json_object *afb_xreq_json(struct afb_xreq *xreq)
afb_xreq_fail_unknown_verb(xreq);
else
if (!xreq_session_check_apply_v1(xreq, verb->session))
- verb->callback(to_req(xreq));
+ verb->callback(xreq_to_req(xreq));
}
void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb)
afb_xreq_fail_unknown_verb(xreq);
else
if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth))
- verb->callback(to_req(xreq));
+ verb->callback(xreq_to_req(xreq));
}
void afb_xreq_call_verb_vdyn(struct afb_xreq *xreq, const struct afb_api_dyn_verb *verb)