#include <string.h>
#include <json-c/json.h>
-#include <afb/afb-req-itf.h>
+#include <afb/afb-event-itf.h>
#include "afb-subcall.h"
#include "afb-msg-json.h"
free(subcall);
}
-static void subcall_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj)
+static void subcall_reply(struct afb_xreq *xreq, int status, struct json_object *obj)
{
struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
- subcall->callback(subcall->closure, iserror, obj);
+ subcall->callback(subcall->closure, status, obj);
json_object_put(obj);
}
lenapi = 1 + strlen(api);
lenverb = 1 + strlen(verb);
subcall = malloc(lenapi + lenverb + sizeof *subcall);
- if (subcall == NULL)
+ if (subcall == NULL) {
+ json_object_put(args); /* keep args existing */
callback(closure, 1, afb_msg_json_internal_error());
- else {
+ } else {
afb_xreq_init(&subcall->xreq, &afb_subcall_xreq_itf);
afb_context_subinit(&subcall->xreq.context, &caller->context);
subcall->xreq.cred = afb_cred_addref(caller->cred);
subcall->callback = callback;
subcall->closure = closure;
afb_xreq_addref(caller);
- json_object_get(args); /* keep args existing */
afb_xreq_process(&subcall->xreq, caller->apiset);
}
}