X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-subcall.c;h=8a8c77a985dc185c8f7628158e1c7ab59d3a981c;hb=1a64df64ca126fb1e0dbe08c432d3c015d4ac458;hp=a75cbdd096780422f5e764d7f3df6b8cf00e817e;hpb=a138fda9841c46e28de93e32aee62956e26556b1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-subcall.c b/src/afb-subcall.c
index a75cbdd0..8a8c77a9 100644
--- a/src/afb-subcall.c
+++ b/src/afb-subcall.c
@@ -25,7 +25,7 @@
 
 #include "afb-subcall.h"
 #include "afb-msg-json.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-context.h"
 #include "afb-xreq.h"
 #include "afb-cred.h"
@@ -89,18 +89,25 @@ static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
 static struct subcall *create_subcall(struct afb_xreq *caller, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
 {
 	struct subcall *subcall;
+	size_t lenapi, lenverb;
+	char *copy;
 
-	subcall = calloc(1, sizeof *subcall);
+	lenapi = 1 + strlen(api);
+	lenverb = 1 + strlen(verb);
+	subcall = malloc(lenapi + lenverb + sizeof *subcall);
 	if (subcall == NULL) {
 		return NULL;
 	}
-
 	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->xreq.json = args;
-	subcall->xreq.api = api; /* TODO: alloc ? */
-	subcall->xreq.verb = verb; /* TODO: alloc ? */
+	copy = (char*)&subcall[1];
+	memcpy(copy, api, lenapi);
+	subcall->xreq.api = copy;
+	copy = &copy[lenapi];
+	memcpy(copy, verb, lenverb);
+	subcall->xreq.verb = copy;
 	subcall->caller = caller;
 	subcall->callback = callback;
 	subcall->closure = closure;
@@ -126,8 +133,7 @@ void afb_subcall(
 		return;
 	}
 
-	afb_apis_call(&subcall->xreq);
-	afb_xreq_unref(&subcall->xreq);
+	afb_xreq_process(&subcall->xreq, caller->apiset);
 }
 
 struct subcall_sync