Improve naming of evt_eventids

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

diff --git a/src/afb-export.c b/src/afb-export.c
index f8e4be7..19aab0c 100644 (file)
--- a/src/afb-export.c
+++ b/src/afb-export.c
@@ -173,7 +173,7 @@ static struct afb_eventid *eventid_make_cb(void *closure, const char *name)
        memcpy(event + plen + 1, name, nlen + 1);
 
        /* create the event */
-       return afb_evt_create_event(event);
+       return afb_evt_eventid_create(event);
 }
 
 static struct afb_event event_make_cb(void *closure, const char *name)
@@ -568,10 +568,10 @@ static struct call_req *callreq_create(
                callreq->xreq.context.validated = 1;
                copy = (char*)&callreq[1];
                memcpy(copy, api, lenapi);
-               callreq->xreq.api = copy;
+               callreq->xreq.request.api = copy;
                copy = &copy[lenapi];
                memcpy(copy, verb, lenverb);
-               callreq->xreq.verb = copy;
+               callreq->xreq.request.verb = copy;
                callreq->xreq.listener = export->listener;
                callreq->xreq.json = args;
                callreq->export = export;
@@ -1080,6 +1080,7 @@ static struct afb_export *create(struct afb_apiset *apiset, const char *apiname,
        else {
                memset(export, 0, sizeof *export);
                export->apiname = strdup(apiname);
+               export->dynapi.apiname = export->apiname;
                export->version = version;
                export->state = Api_State_Pre_Init;
                export->session = afb_session_addref(common_session);
@@ -1144,6 +1145,7 @@ void afb_export_rename(struct afb_export *export, const char *apiname)
 {
        free(export->apiname);
        export->apiname = strdup(apiname);
+       export->dynapi.apiname = export->apiname;
        afb_export_update_hook(export);
 }