Make status common

[src/app-framework-binder.git] / src / afb-subcall.c

diff --git a/src/afb-subcall.c b/src/afb-subcall.c
index ef11407..4af6274 100644 (file)
--- a/src/afb-subcall.c
+++ b/src/afb-subcall.c
@@ -21,7 +21,7 @@
 #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"
@@ -49,11 +49,11 @@ static void subcall_destroy(struct afb_xreq *xreq)
        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);
 }
 
@@ -94,9 +94,10 @@ void afb_subcall(
        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);
@@ -111,7 +112,6 @@ void afb_subcall(
                subcall->callback = callback;
                subcall->closure = closure;
                afb_xreq_addref(caller);
-               json_object_get(args); /* keep args existing */
                afb_xreq_process(&subcall->xreq, caller->apiset);
        }
 }