X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=834850f222490f7743a706a13d3bf8957227cc3a;hb=7ea1657b459aea2cc6ef9332621a19d7e2676b1d;hp=0af3b42cd4a36c0a54d4e71fe7ee842f395d92ab;hpb=469e619ac45402471ea7d8c792ffc06e79346ef2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 0af3b42c..834850f2 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -25,6 +25,7 @@
 #include "session.h"
 #include "verbose.h"
 #include "afb-apis.h"
+#include "afb-context.h"
 #include "afb-req-itf.h"
 
 struct api_desc {
@@ -41,13 +42,6 @@ int afb_apis_count()
 	return apis_count;
 }
 
-void afb_apis_free_context(int apiidx, void *context)
-{
-	const struct afb_api *api;
-	api = &apis_array[apiidx].api;
-	api->free_context(api->closure, context);
-}
-
 int afb_apis_add(const char *name, struct afb_api api)
 {
 	struct api_desc *apis;
@@ -57,14 +51,14 @@ int afb_apis_add(const char *name, struct afb_api api)
 	/* check existing or not */
 	len = strlen(name);
 	if (len == 0) {
-		fprintf(stderr, "empty api name forbidden\n");
+		ERROR("empty api name forbidden");
 		goto error;
 	}
 
 	/* check previously existing plugin */
 	for (i = 0 ; i < apis_count ; i++) {
 		if (!strcasecmp(apis_array[i].name, name)) {
-			fprintf(stderr, "ERROR: api of name %s already exists\n", name);
+			ERROR("api of name %s already exists", name);
 			goto error;
 		}
 	}
@@ -72,7 +66,7 @@ int afb_apis_add(const char *name, struct afb_api api)
 	/* allocates enough memory */
 	apis = realloc(apis_array, ((unsigned)apis_count + 1) * sizeof * apis);
 	if (apis == NULL) {
-		fprintf(stderr, "out of memory\n");
+		ERROR("out of memory");
 		goto error;
 	}
 	apis_array = apis;
@@ -90,7 +84,12 @@ error:
 	return -1;
 }
 
-void afb_apis_call(struct afb_req req, struct AFB_clientCtx *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+void afb_apis_call_(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
+{
+	afb_apis_call(req, context, api, strlen(api), verb, strlen(verb));
+}
+
+void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
 {
 	int i;
 	const struct api_desc *a;
@@ -98,8 +97,8 @@ void afb_apis_call(struct afb_req req, struct AFB_clientCtx *context, const char
 	a = apis_array;
 	for (i = 0 ; i < apis_count ; i++, a++) {
 		if (a->namelen == lenapi && !strncasecmp(a->name, api, lenapi)) {
-			req.context = &context->contexts[i];
-			a->api.call(a->api.closure, req, verb, lenverb);
+			context->api_index = i;
+			a->api.call(a->api.closure, req, context, verb, lenverb);
 			return;
 		}
 	}