X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibelogind%2Fsd-bus%2Fsd-bus.c;h=5b679c056906a7727987bb9e6ab83552258a2afd;hb=4084669c7f802c9745bcb6bed77bdaf49ffd896d;hp=7e733cdea0e04000924323a6d91a689d44f87232;hpb=da4b83e77bc603745cf4a365d7f013301ef7fa89;p=elogind.git diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index 7e733cdea..5b679c056 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -75,7 +75,9 @@ static int attach_io_events(sd_bus *b); static void detach_io_events(sd_bus *b); static thread_local sd_bus *default_system_bus = NULL; -// UNNEEDED static thread_local sd_bus *default_user_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 void bus_close_fds(sd_bus *b) { @@ -233,8 +235,7 @@ _public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { return 0; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { char *p, **a; @@ -383,8 +384,7 @@ _public_ int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b) { return 0; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_get_allow_interactive_authorization(sd_bus *bus) { assert_return(bus, -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); @@ -1164,8 +1164,7 @@ _public_ int sd_bus_open(sd_bus **ret) { if (e) { if (streq(e, "system")) return sd_bus_open_system(ret); -/// elogind does not support systemd units -#if 0 +#if 0 /// elogind does not support systemd units else if (STR_IN_SET(e, "session", "user")) return sd_bus_open_user(ret); #endif // 0 @@ -1173,8 +1172,7 @@ _public_ int sd_bus_open(sd_bus **ret) { e = secure_getenv("DBUS_STARTER_ADDRESS"); if (!e) { -/// elogind does not support systemd units -#if 0 +#if 0 /// elogind does not support systemd units if (cg_pid_get_owner_uid(0, NULL) >= 0) return sd_bus_open_user(ret); else @@ -1256,8 +1254,7 @@ fail: return r; } -/// elogind can not open/use a user bus -#if 0 +#if 0 /// elogind can not open/use a user bus int bus_set_address_user(sd_bus *b) { const char *e; uid_t uid; @@ -1293,8 +1290,7 @@ int bus_set_address_user(sd_bus *b) { #endif // 0 _public_ int sd_bus_open_user(sd_bus **ret) { -/// elogind does not support user buses -#if 0 +#if 0 /// elogind does not support user buses sd_bus *b; int r; @@ -1521,8 +1517,7 @@ _public_ sd_bus *sd_bus_unref(sd_bus *bus) { return NULL; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_is_open(sd_bus *bus) { assert_return(bus, -EINVAL); @@ -1556,8 +1551,7 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) { int r; @@ -1849,8 +1843,7 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie) { return bus_send_internal(bus, m, cookie, false); } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie) { int r; @@ -2161,8 +2154,7 @@ fail: return sd_bus_error_set_errno(error, r); } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_get_fd(sd_bus *bus) { assert_return(bus, -EINVAL); @@ -2847,8 +2839,7 @@ _public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { return bus_process_internal(bus, false, 0, ret); } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_process_priority(sd_bus *bus, int64_t priority, sd_bus_message **ret) { return bus_process_internal(bus, true, priority, ret); } @@ -2969,8 +2960,7 @@ _public_ int sd_bus_flush(sd_bus *bus) { } } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_add_filter( sd_bus *bus, sd_bus_slot **slot, @@ -3074,8 +3064,7 @@ finish: return r; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind int bus_remove_match_by_string( sd_bus *bus, const char *match, @@ -3352,8 +3341,7 @@ _public_ sd_bus_message* sd_bus_get_current_message(sd_bus *bus) { return bus->current_message; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ sd_bus_slot* sd_bus_get_current_slot(sd_bus *bus) { assert_return(bus, NULL); @@ -3406,8 +3394,7 @@ _public_ int sd_bus_default_system(sd_bus **ret) { _public_ int sd_bus_default_user(sd_bus **ret) { -/// elogind does not support user buses -#if 0 +#if 0 /// elogind does not support user buses return bus_default(sd_bus_open_user, &default_user_bus, ret); #else return sd_bus_default_system(ret); @@ -3428,8 +3415,7 @@ _public_ int sd_bus_default(sd_bus **ret) { if (e) { if (streq(e, "system")) return sd_bus_default_system(ret); -/// elogind does not support systemd units -#if 0 +#if 0 /// elogind does not support systemd units else if (STR_IN_SET(e, "user", "session")) return sd_bus_default_user(ret); #endif // 0 @@ -3447,8 +3433,7 @@ _public_ int sd_bus_default(sd_bus **ret) { /* Finally, if nothing is set use the cached connection for * the right scope */ -/// elogind does not support systemd units -#if 0 +#if 0 /// elogind does not support systemd units if (cg_pid_get_owner_uid(0, NULL) >= 0) return sd_bus_default_user(ret); else @@ -3456,8 +3441,7 @@ _public_ int sd_bus_default(sd_bus **ret) { return sd_bus_default_system(ret); } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) { assert_return(b, -EINVAL); assert_return(tid, -EINVAL); @@ -3736,8 +3720,7 @@ int bus_get_root_path(sd_bus *bus) { return r; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind _public_ int sd_bus_get_scope(sd_bus *bus, const char **scope) { int r;