X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-v3.c;h=1fc6ebe44561308acc75d3a456a2505383808fee;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=5134c96f9991f32a4e26143a7f75380b039f0c4a;hpb=8ca7b69f3e3145f4c08bdbd278f200f6f8868d74;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-v3.c b/src/afb-api-v3.c
index 5134c96f..1fc6ebe4 100644
--- a/src/afb-api-v3.c
+++ b/src/afb-api-v3.c
@@ -135,9 +135,9 @@ static struct json_object *describe_verb_v3(const struct afb_verb_v3 *verb)
 
 	a = json_object_new_object();
 	json_object_object_add(g, "responses", a);
-	f = json_object_new_object();
-	json_object_object_add(a, "200", f);
-	json_object_object_add(f, "description", json_object_new_string(verb->info?:verb->verb));
+	g = json_object_new_object();
+	json_object_object_add(a, "200", g);
+	json_object_object_add(g, "description", json_object_new_string(verb->info?:verb->verb));
 
 	return f;
 }
@@ -158,44 +158,47 @@ struct json_object *afb_api_v3_make_description_openAPIv3(struct afb_api_v3 *api
 	json_object_object_add(i, "version", json_object_new_string("0.0.0"));
 	json_object_object_add(i, "description", json_object_new_string(api->info));
 
+	buffer[0] = '/';
+	buffer[sizeof buffer - 1] = 0;
+
 	p = json_object_new_object();
 	json_object_object_add(r, "paths", p);
 	iter = api->verbs;
 	end = iter + api->count;
 	while (iter != end) {
 		verb = *iter++;
-		buffer[0] = '/';
-		strncpy(buffer + 1, verb->verb, sizeof buffer - 1);
+		strncpy(buffer + 1, verb->verb, sizeof buffer - 2);
 		json_object_object_add(p, buffer, describe_verb_v3(verb));
 	}
 	verb = api->verbsv3;
 	if (verb)
 		while(verb->verb) {
-			buffer[0] = '/';
-			strncpy(buffer + 1, verb->verb, sizeof buffer - 1);
+			strncpy(buffer + 1, verb->verb, sizeof buffer - 2);
 			json_object_object_add(p, buffer, describe_verb_v3(verb));
 			verb++;
 		}
 	return r;
 }
 
-struct afb_api_v3 *afb_api_v3_create(
-		struct afb_apiset *declare_set,
+struct afb_api_v3 *afb_api_v3_create(struct afb_apiset *declare_set,
 		struct afb_apiset *call_set,
 		const char *apiname,
 		const char *info,
 		int noconcurrency,
 		int (*preinit)(void*, struct afb_api_x3 *),
 		void *closure,
-		int copy_info
-)
+		int copy_info,
+		struct afb_export* creator,
+		const char* path)
 {
 	struct afb_api_v3 *api;
 
 	/* allocates the description */
 	api = calloc(1, sizeof *api + (copy_info && info ? 1 + strlen(info) : 0));
-	if (!api)
+	if (!api) {
+		ERROR("out of memory");
 		goto oom;
+	}
 	api->refcount = 1;
 	if (!info)
 		api->info = &nulchar;
@@ -204,7 +207,7 @@ struct afb_api_v3 *afb_api_v3_create(
 	else
 		api->info = info;
 
-	api->export = afb_export_create_v3(declare_set, call_set, apiname, api);
+	api->export = afb_export_create_v3(declare_set, call_set, apiname, api, creator, path);
 	if (!api->export)
 		goto oom2;
 
@@ -223,7 +226,6 @@ oom3:
 oom2:
 	free(api);
 oom:
-	ERROR("out of memory");
 	return NULL;
 }
 
@@ -238,6 +240,9 @@ void afb_api_v3_unref(struct afb_api_v3 *api)
 {
 	if (api && !__atomic_sub_fetch(&api->refcount, 1, __ATOMIC_RELAXED)) {
 		afb_export_destroy(api->export);
+		while (api->count)
+			free(api->verbs[--api->count]);
+		free(api->verbs);
 		free(api);
 	}
 }
@@ -321,19 +326,16 @@ int afb_api_v3_del_verb(
 		const char *verb,
 		void **vcbdata)
 {
-	struct afb_verb_v3 **v, **e, *i;
+	struct afb_verb_v3 *v;
+	int i;
 
-	v = api->verbs;
-	e = &v[api->count];
-	while (v != e) {
-		i = *v++;
-		if (!strcasecmp(i->verb, verb)) {
-			api->count--;
+	for (i = 0 ; i < api->count ; i++) {
+		v = api->verbs[i];
+		if (!strcasecmp(verb, v->verb)) {
+			api->verbs[i] = api->verbs[--api->count];
 			if (vcbdata)
-				*vcbdata = i->vcbdata;
-			if (v != e)
-				*--v = *--e;
-			free(i);
+				*vcbdata = v->vcbdata;
+			free(v);
 			return 0;
 		}
 	}
@@ -399,6 +401,6 @@ static int init_binding(void *closure, struct afb_api_x3 *api)
 
 struct afb_api_v3 *afb_api_v3_from_binding(const struct afb_binding_v3 *desc, struct afb_apiset *declare_set, struct afb_apiset * call_set)
 {
-	return afb_api_v3_create(declare_set, call_set, desc->api, desc->info, desc->noconcurrency, init_binding, (void*)desc, 0);
+	return afb_api_v3_create(declare_set, call_set, desc->api, desc->info, desc->noconcurrency, init_binding, (void*)desc, 0, NULL, NULL);
 }