afb-apiset: refactor access to apis

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

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 80dd143..73841af 100644 (file)
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -876,7 +876,7 @@ void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq)
 
 static void process_sync(struct afb_xreq *xreq)
 {
-       struct afb_api api;
+       const struct afb_api *api;
 
        /* init hooking */
        afb_hook_init_xreq(xreq);
@@ -884,14 +884,15 @@ static void process_sync(struct afb_xreq *xreq)
                afb_hook_xreq_begin(xreq);
 
        /* search the api */
-       if (afb_apiset_get_started(xreq->apiset, xreq->api, &api) < 0) {
+       api = afb_apiset_lookup_started(xreq->apiset, xreq->api, 1);
+       if (!api) {
                if (errno == ENOENT)
                        afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
                else
                        afb_xreq_fail_f(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->api);
        } else {
-               xreq->context.api_key = api.closure;
-               api.itf->call(api.closure, xreq);
+               xreq->context.api_key = api->closure;
+               api->itf->call(api->closure, xreq);
        }
 }