diff options
author | Sven Eden <yamakuzure@gmx.net> | 2018-06-05 19:08:31 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-06-05 19:08:54 +0200 |
commit | 10eaaae37e8445c417f6820907db107194f3fa4f (patch) | |
tree | e5090759e1601a3315f84c15f4618b61ed93ddd1 /src/libelogind/sd-bus | |
parent | 4ecaac69d8ee3f5b7f3949b144ba51e576540c89 (diff) |
Prep v238: Uncomment now needed headers and unmask now needed functions in src/libelogind (3/6)
Diffstat (limited to 'src/libelogind/sd-bus')
-rw-r--r-- | src/libelogind/sd-bus/bus-control.c | 2 | ||||
-rw-r--r-- | src/libelogind/sd-bus/bus-gvariant.c | 6 | ||||
-rw-r--r-- | src/libelogind/sd-bus/bus-signature.c | 2 | ||||
-rw-r--r-- | src/libelogind/sd-bus/bus-socket.c | 8 | ||||
-rw-r--r-- | src/libelogind/sd-bus/bus-type.c | 4 | ||||
-rw-r--r-- | src/libelogind/sd-bus/sd-bus.c | 7 |
6 files changed, 11 insertions, 18 deletions
diff --git a/src/libelogind/sd-bus/bus-control.c b/src/libelogind/sd-bus/bus-control.c index 09b934e7f..9dd5274bf 100644 --- a/src/libelogind/sd-bus/bus-control.c +++ b/src/libelogind/sd-bus/bus-control.c @@ -33,7 +33,7 @@ #include "bus-message.h" #include "bus-util.h" #include "capability-util.h" -//#include "process-util.h" +#include "process-util.h" #include "stdio-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/libelogind/sd-bus/bus-gvariant.c b/src/libelogind/sd-bus/bus-gvariant.c index 8730a924c..e6ab984d1 100644 --- a/src/libelogind/sd-bus/bus-gvariant.c +++ b/src/libelogind/sd-bus/bus-gvariant.c @@ -18,10 +18,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -//#include <errno.h> -//#include <string.h> +#include <errno.h> +#include <string.h> -//#include "sd-bus.h" +#include "sd-bus.h" #include "bus-gvariant.h" #include "bus-signature.h" diff --git a/src/libelogind/sd-bus/bus-signature.c b/src/libelogind/sd-bus/bus-signature.c index ba9708c7b..f3cd9bd0f 100644 --- a/src/libelogind/sd-bus/bus-signature.c +++ b/src/libelogind/sd-bus/bus-signature.c @@ -20,7 +20,7 @@ #include <util.h> -//#include "sd-bus.h" +#include "sd-bus.h" #include "bus-signature.h" #include "bus-type.h" diff --git a/src/libelogind/sd-bus/bus-socket.c b/src/libelogind/sd-bus/bus-socket.c index bb0e612b9..b5160cff6 100644 --- a/src/libelogind/sd-bus/bus-socket.c +++ b/src/libelogind/sd-bus/bus-socket.c @@ -32,13 +32,13 @@ #include "bus-socket.h" #include "fd-util.h" #include "format-util.h" -//#include "fs-util.h" +#include "fs-util.h" #include "hexdecoct.h" -//#include "io-util.h" +#include "io-util.h" #include "macro.h" #include "missing.h" -//#include "path-util.h" -//#include "process-util.h" +#include "path-util.h" +#include "process-util.h" #include "selinux-util.h" #include "signal-util.h" #include "stdio-util.h" diff --git a/src/libelogind/sd-bus/bus-type.c b/src/libelogind/sd-bus/bus-type.c index c580faaf9..8a7b522c3 100644 --- a/src/libelogind/sd-bus/bus-type.c +++ b/src/libelogind/sd-bus/bus-type.c @@ -18,9 +18,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -//#include <errno.h> +#include <errno.h> -//#include "sd-bus.h" +#include "sd-bus.h" #include "bus-type.h" diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index c42af08dd..eb415e6e3 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -82,9 +82,7 @@ static void bus_detach_io_events(sd_bus *b); static void bus_detach_inotify_event(sd_bus *b); static thread_local sd_bus *default_system_bus = NULL; -#if 0 /// UNNEEDED by elogind static thread_local sd_bus *default_user_bus = NULL; -#endif // 0 static thread_local sd_bus *default_starter_bus = NULL; static sd_bus **bus_choose_default(int (**bus_open)(sd_bus **)) { @@ -3700,11 +3698,6 @@ _public_ int sd_bus_default(sd_bus **ret) { int (*bus_open)(sd_bus **) = NULL; sd_bus **busp; -#if 0 /// elogind does not support systemd units -#endif // 0 - -#if 0 /// elogind does not support systemd user instances -#endif // 0 busp = bus_choose_default(&bus_open); return bus_default(bus_open, busp, ret); } |