From b798adf312fe0510d8a26dec7f57dacfefcd275c Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 19 Jul 2018 14:09:17 +0200 Subject: Fix errors in migration to V3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a tiny error in the migration script and improve it. Fix declaration of afb_daemon_get... without args for binding V3 compatibility. Fix declaration of afb_api_event_handler_... Fix the correct URL to the sed script: valid: https://git.automotivelinux.org/src/app-framework-binder/plain/docs/migration-to-binding-v3.sed invalid: https://git.automotivelinux.org/src/app-framework-binder/tree/docs/migration-to-binding-v3.sed Bug-AGL: SPEC-1595 Change-Id: I245b20a9c14634a94c69420312afbd97628bc750 Signed-off-by: José Bollo --- include/afb/afb-binding-predefs.h | 2 ++ include/afb/afb-binding-v3.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/afb/afb-binding-predefs.h b/include/afb/afb-binding-predefs.h index 5a3d048a..791374b9 100644 --- a/include/afb/afb-binding-predefs.h +++ b/include/afb/afb-binding-predefs.h @@ -327,6 +327,8 @@ #define afb_api_x3_on_init afb_api_on_init #define afb_api_x3_seal afb_api_seal #define afb_api_x3_add_alias afb_api_add_alias +#define afb_api_x3_event_handler_add afb_api_event_handler_add +#define afb_api_x3_event_handler_del afb_api_event_handler_del #define afb_api_x3_require_class afb_api_require_class #define afb_api_x3_provide_class afb_api_provide_class diff --git a/include/afb/afb-binding-v3.h b/include/afb/afb-binding-v3.h index 52a3a8d2..9df2eb99 100644 --- a/include/afb/afb-binding-v3.h +++ b/include/afb/afb-binding-v3.h @@ -245,9 +245,9 @@ extern const struct afb_binding_v3 afbBindingV3; #define afb_get_logmask_v3() (afbBindingV3root->logmask) #define afb_get_verbosity_v3() AFB_SYSLOG_LEVEL_TO_VERBOSITY(_afb_verbomask_to_upper_level_(afbBindingV3root->logmask)) -#define afb_daemon_get_event_loop_v3(...) afb_api_get_event_loop(afbBindingV3root,__VA_ARGS__) -#define afb_daemon_get_user_bus_v3(...) afb_api_get_user_bus(afbBindingV3root,__VA_ARGS__) -#define afb_daemon_get_system_bus_v3(...) afb_api_get_system_bus(afbBindingV3root,__VA_ARGS__) +#define afb_daemon_get_event_loop_v3() afb_api_get_event_loop(afbBindingV3root) +#define afb_daemon_get_user_bus_v3() afb_api_get_user_bus(afbBindingV3root) +#define afb_daemon_get_system_bus_v3() afb_api_get_system_bus(afbBindingV3root) #define afb_daemon_broadcast_event_v3(...) afb_api_broadcast_event(afbBindingV3root,__VA_ARGS__) #define afb_daemon_make_event_v3(...) afb_api_make_event(afbBindingV3root,__VA_ARGS__) #define afb_daemon_verbose_v3(...) afb_api_verbose(afbBindingV3root,__VA_ARGS__) -- cgit 1.2.3-korg