Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrates subcalls to use xreq
[src/app-framework-binder.git]
/
src
/
afb-common.c
diff --git
a/src/afb-common.c
b/src/afb-common.c
index
81bf537
..
087a628
100644
(file)
--- 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 <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-27,6
+27,7
@@
#include "afb-common.h"
#include "locale-root.h"
#include "afb-common.h"
#include "locale-root.h"
+#include "jobs.h"
static const char *default_locale = NULL;
static struct locale_root *rootdir = NULL;
static const char *default_locale = NULL;
static struct locale_root *rootdir = NULL;
@@
-42,7
+43,6
@@
struct sd_event *afb_common_get_thread_event_loop()
}
return result;
}
}
return result;
}
-*/
static void *sdopen(void **p, int (*f)(void **))
{
static void *sdopen(void **p, int (*f)(void **))
{
@@
-55,6
+55,7
@@
static void *sdopen(void **p, int (*f)(void **))
}
return *p;
}
}
return *p;
}
+*/
static struct sd_bus *sdbusopen(struct sd_bus **p, int (*f)(struct sd_bus **))
{
static struct sd_bus *sdbusopen(struct sd_bus **p, int (*f)(struct sd_bus **))
{
@@
-77,8
+78,7
@@
static struct sd_bus *sdbusopen(struct sd_bus **p, int (*f)(struct sd_bus **))
struct sd_event *afb_common_get_event_loop()
{
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()
}
struct sd_bus *afb_common_get_user_bus()