X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fsd-bus.c;fp=src%2Flibsystemd%2Fsd-bus%2Fsd-bus.c;h=6b35036c06db68aadbdf32a761be245ff96e04c1;hb=5b820358cf2a5cb6d67cc0b1faaaca3b0171f1ac;hp=5947cd72c9c3c5ed102ce26cb2df377920608cd4;hpb=5c3026927de9dfa60ad6ae8326fef5d7824e723e;p=elogind.git diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 5947cd72c..6b35036c0 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3396,24 +3396,38 @@ _public_ int sd_bus_get_scope(sd_bus *bus, const char **scope) { if (streq(n, "0-system")) { *scope = "system"; - return 1; + return 0; } dash = strchr(n, '-'); if (streq(dash, "-user")) { *scope = "user"; - return 1; + return 0; } } if (bus->is_user) { *scope = "user"; - return 1; + return 0; } if (bus->is_system) { *scope = "system"; - return 1; + return 0; + } + + return -ENODATA; +} + +_public_ int sd_bus_get_address(sd_bus *bus, const char **address) { + + assert_return(bus, -EINVAL); + assert_return(address, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (bus->address) { + *address = bus->address; + return 0; } return -ENODATA;