provides developper files

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

diff --git a/src/afb-apis.c b/src/afb-apis.c
index bcb4242..5ebc96f 100644 (file)
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -25,7 +25,8 @@
 #include "session.h"
 #include "verbose.h"
 #include "afb-apis.h"
-#include "afb-req-itf.h"
+#include "afb-context.h"
+#include <afb/afb-req-itf.h>
 
 struct api_desc {
        struct afb_api api;
@@ -50,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;
                }
        }
@@ -65,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;
@@ -83,12 +84,12 @@ error:
        return -1;
 }
 
-void afb_apis_call_(struct afb_req req, struct AFB_clientCtx *context, const char *api, const char *verb)
+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_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, size_t lenapi, const char *verb, size_t lenverb)
 {
        int i;
        const struct api_desc *a;
@@ -96,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.ctx_closure = &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;
                }
        }