X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-common.c;h=60e0a0fa686d3a58240dad45a0df65a1af0590a9;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=81bf537632371fa1c1a0706496b97c67df432462;hpb=7c7d610ccbd7e30204501622ebee6690aef5af0c;p=src%2Fapp-framework-binder.git diff --git a/src/afb-common.c b/src/afb-common.c index 81bf5376..60e0a0fa 100644 --- a/src/afb-common.c +++ b/src/afb-common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,13 +17,10 @@ #define _GNU_SOURCE +#include +#include #include #include -#include -#include -#include -#include -#include #include "afb-common.h" #include "locale-root.h" @@ -31,68 +28,6 @@ static const char *default_locale = NULL; static struct locale_root *rootdir = NULL; -/* -struct sd_event *afb_common_get_thread_event_loop() -{ - sd_event *result; - int rc = sd_event_default(&result); - if (rc != 0) { - errno = -rc; - result = NULL; - } - return result; -} -*/ - -static void *sdopen(void **p, int (*f)(void **)) -{ - if (*p == NULL) { - int rc = f(p); - if (rc < 0) { - errno = -rc; - *p = NULL; - } - } - return *p; -} - -static struct sd_bus *sdbusopen(struct sd_bus **p, int (*f)(struct sd_bus **)) -{ - if (*p == NULL) { - int rc = f(p); - if (rc < 0) { - errno = -rc; - *p = NULL; - } else { - rc = sd_bus_attach_event(*p, afb_common_get_event_loop(), 0); - if (rc < 0) { - sd_bus_unref(*p); - errno = -rc; - *p = NULL; - } - } - } - return *p; -} - -struct sd_event *afb_common_get_event_loop() -{ - static struct sd_event *result = NULL; - return sdopen((void*)&result, (void*)sd_event_new); -} - -struct sd_bus *afb_common_get_user_bus() -{ - static struct sd_bus *result = NULL; - return sdbusopen((void*)&result, (void*)sd_bus_open_user); -} - -struct sd_bus *afb_common_get_system_bus() -{ - static struct sd_bus *result = NULL; - return sdbusopen((void*)&result, (void*)sd_bus_open_system); -} - void afb_common_default_locale_set(const char *locale) { default_locale = locale;