X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-common.c;h=c6c876b43f9e5bc5665fa2f68f297500fef8c064;hb=3535d4cb73628c720da1bf74627ded2aec6f2ca1;hp=81bf537632371fa1c1a0706496b97c67df432462;hpb=7c7d610ccbd7e30204501622ebee6690aef5af0c;p=src%2Fapp-framework-binder.git diff --git a/src/afb-common.c b/src/afb-common.c index 81bf5376..c6c876b4 100644 --- a/src/afb-common.c +++ b/src/afb-common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 "IoT.bzh" + * Copyright (C) 2015, 2016, 2017 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,35 +27,11 @@ #include "afb-common.h" #include "locale-root.h" +#include "jobs.h" 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) { @@ -77,8 +53,7 @@ static struct sd_bus *sdbusopen(struct sd_bus **p, int (*f)(struct sd_bus **)) struct sd_event *afb_common_get_event_loop() { - static struct sd_event *result = NULL; - return sdopen((void*)&result, (void*)sd_event_new); + return jobs_get_sd_event(); } struct sd_bus *afb_common_get_user_bus()