X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=bcb42429401f4fc404b35e66cd5dc6aa83a143dd;hb=bd68881a7977d2fe63d4ca85b757ed9c127ec21d;hp=561b2752bf20cbeb5d1131c81f7569bb5552f5ed;hpb=83ce3b29a598141f8f28afde655beb07ec78c312;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 561b2752..bcb42429 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -3,48 +3,29 @@
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contain all generic part to handle REST/API
- * 
- *  https://www.gnu.org/software/libmicrohttpd/tutorial.html [search 'largepost.c']
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #define _GNU_SOURCE
 
+#include <stdlib.h>
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
-#include <dirent.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/syscall.h>
-#include <setjmp.h>
-
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
-#include "afb-poll-itf.h"
 
 #include "session.h"
-#include "afb-apis.h"
 #include "verbose.h"
-#include "utils-upoll.h"
+#include "afb-apis.h"
+#include "afb-req-itf.h"
 
 struct api_desc {
 	struct afb_api api;
@@ -60,13 +41,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;
@@ -109,6 +83,11 @@ error:
 	return -1;
 }
 
+void afb_apis_call_(struct afb_req req, struct AFB_clientCtx *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_clientCtx *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
 {
 	int i;
@@ -117,7 +96,7 @@ 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];
+			req.ctx_closure = &context->contexts[i];
 			a->api.call(a->api.closure, req, verb, lenverb);
 			return;
 		}