From 44f21bd2a3b50f92669223cdafe79993654c1e19 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Mon, 27 Mar 2017 11:23:51 +0200 Subject: Simplify functions for calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For historical reasons, the call to apis was passing the length of the api and the length of the verb. The reason was to avoid a copy of strings. But the copy occured only for HTTP requests. Having this implementation is of small interest and compromise future changes. This patch simplify things. Change-Id: I8157724c6c721b6797cd0eab52b07e1b8d6eb5f8 Signed-off-by: José Bollo --- src/afb-api-dbus.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/afb-api-dbus.c') diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c index 4a5a4f1f..179f8954 100644 --- a/src/afb-api-dbus.c +++ b/src/afb-api-dbus.c @@ -317,11 +317,11 @@ static int api_dbus_client_on_reply(sd_bus_message *message, void *userdata, sd_ } /* on call, propagate it to the dbus service */ -static void api_dbus_client_call(struct api_dbus *api, struct afb_req req, struct afb_context *context, const char *verb, size_t lenverb) +static void api_dbus_client_call(void *closure, struct afb_req req, struct afb_context *context, const char *verb) { + struct api_dbus *api = closure; size_t size; int rc; - char *method = strndupa(verb, lenverb); struct dbus_memo *memo; struct sd_bus_message *msg; @@ -334,7 +334,7 @@ static void api_dbus_client_call(struct api_dbus *api, struct afb_req req, struc /* creates the message */ msg = NULL; - rc = sd_bus_message_new_method_call(api->sdbus, &msg, api->name, api->path, api->name, method); + rc = sd_bus_message_new_method_call(api->sdbus, &msg, api->name, api->path, api->name, verb); if (rc < 0) goto error; @@ -363,8 +363,10 @@ end: sd_bus_message_unref(msg); } -static int api_dbus_service_start(struct api_dbus *api, int share_session, int onneed) +static int api_dbus_service_start(void *closure, int share_session, int onneed) { + struct api_dbus *api = closure; + /* not an error when onneed */ if (onneed != 0) return 0; @@ -618,8 +620,8 @@ int afb_api_dbus_add_client(const char *path) /* record it as an API */ afb_api.closure = api; - afb_api.call = (void*)api_dbus_client_call; - afb_api.service_start = (void*)api_dbus_service_start; + afb_api.call = api_dbus_client_call; + afb_api.service_start = api_dbus_service_start; if (afb_apis_add(api->api, afb_api) < 0) goto error2; @@ -1003,7 +1005,7 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd dreq->refcount = 1; areq.itf = &afb_api_dbus_req_itf; areq.closure = dreq; - afb_apis_call_(areq, &dreq->context, api->api, method); + afb_apis_call(areq, &dreq->context, api->api, method); dbus_req_unref(dreq); return 1; -- cgit 1.2.3-korg