From 031601a0c5aa944493660f991d66702cc7e52755 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Tue, 17 May 2016 23:47:13 +0200 Subject: event sender: better naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I82d918cd14b1e368ef509fa3a1b21c3e55a6b98d Signed-off-by: José Bollo --- include/afb/afb-event-sender-itf.h | 35 +++++++++++++++++++++++++++++++++++ include/afb/afb-evmgr-itf.h | 35 ----------------------------------- include/afb/afb-plugin.h | 10 +++++----- 3 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 include/afb/afb-event-sender-itf.h delete mode 100644 include/afb/afb-evmgr-itf.h (limited to 'include/afb') diff --git a/include/afb/afb-event-sender-itf.h b/include/afb/afb-event-sender-itf.h new file mode 100644 index 00000000..ad354319 --- /dev/null +++ b/include/afb/afb-event-sender-itf.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2016 "IoT.bzh" + * Author: José Bollo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +struct json_object; + +struct afb_event_sender_itf { + void (*push)(void *event_sender, const char *name, struct json_object *object); +}; + +struct afb_event_sender { + const struct afb_event_sender_itf *itf; + void *closure; +}; + +static inline void afb_event_sender_push(struct afb_event_sender mgr, const char *name, struct json_object *object) +{ + return mgr.itf->push(mgr.closure, name, object); +} + diff --git a/include/afb/afb-evmgr-itf.h b/include/afb/afb-evmgr-itf.h deleted file mode 100644 index 90b1e0a9..00000000 --- a/include/afb/afb-evmgr-itf.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author: José Bollo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -struct json_object; - -struct afb_evmgr_itf { - void (*push)(void *evmgr, const char *name, struct json_object *object); -}; - -struct afb_evmgr { - const struct afb_evmgr_itf *itf; - void *closure; -}; - -static inline void afb_evmgr_push(struct afb_evmgr mgr, const char *name, struct json_object *object) -{ - return mgr.itf->push(mgr.closure, name, object); -} - diff --git a/include/afb/afb-plugin.h b/include/afb/afb-plugin.h index d3f6423d..de1ab419 100644 --- a/include/afb/afb-plugin.h +++ b/include/afb/afb-plugin.h @@ -18,7 +18,7 @@ #pragma once #include -#include +#include /* * Definition of the versions of the plugin. @@ -93,7 +93,7 @@ struct sd_bus; * Definition of the facilities provided by the daemon. */ struct afb_daemon_itf { - struct afb_evmgr (*get_evmgr)(void *closure); /* get the event manager */ + struct afb_event_sender (*get_event_sender)(void *closure); /* get the event manager */ struct sd_event *(*get_event_loop)(void *closure); /* get the common systemd's event loop */ struct sd_bus *(*get_user_bus)(void *closure); /* get the common systemd's user d-bus */ struct sd_bus *(*get_system_bus)(void *closure); /* get the common systemd's system d-bus */ @@ -101,7 +101,7 @@ struct afb_daemon_itf { /* * Structure for accessing daemon. - * See also: afb_daemon_get_evmgr, afb_daemon_get_event_loop, afb_daemon_get_user_bus, afb_daemon_get_system_bus + * See also: afb_daemon_get_event_sender, afb_daemon_get_event_loop, afb_daemon_get_user_bus, afb_daemon_get_system_bus */ struct afb_daemon { const struct afb_daemon_itf *itf; /* the interfacing functions */ @@ -127,9 +127,9 @@ extern const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface * Retrieves the event sender of AFB * 'daemon' MUST be the daemon given in interface when activating the plugin. */ -static inline struct afb_evmgr afb_daemon_get_evmgr(struct afb_daemon daemon) +static inline struct afb_event_sender afb_daemon_get_event_sender(struct afb_daemon daemon) { - return daemon.itf->get_evmgr(daemon.closure); + return daemon.itf->get_event_sender(daemon.closure); } /* -- cgit 1.2.3-korg