diff --git a/man/sd_bus_is_open.xml b/man/sd_bus_is_open.xml index 8e0aed29b3..621ed272bb 100644 --- a/man/sd_bus_is_open.xml +++ b/man/sd_bus_is_open.xml @@ -57,6 +57,9 @@ zero outside of this state, and positive otherwise. Effectively, this function returns positive while regular messages can be sent or received on the connection. + The bus argument may be NULL, zero is also returned in + that case. + To be notified when the connection is fully established, use sd_bus_set_connected_signal3 and install a match for the Connected() signal on the @@ -68,8 +71,8 @@ Return Value - On success, these functions return 0 or a positive integer. On failure, they return a negative errno-style - error code. + Those functions return 0 if the bus is not in the given state, and a positive + integer when it is. On failure, a negative errno-style error code is returned. Errors diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index e719c74370..2f4e67c97e 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1800,7 +1800,9 @@ void bus_enter_closing(sd_bus *bus) { DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus, sd_bus, bus_free); _public_ int sd_bus_is_open(sd_bus *bus) { - assert_return(bus, -EINVAL); + if (!bus) + return 0; + assert_return(bus = bus_resolve(bus), -ENOPKG); assert_return(!bus_pid_changed(bus), -ECHILD); @@ -1808,7 +1810,9 @@ _public_ int sd_bus_is_open(sd_bus *bus) { } _public_ int sd_bus_is_ready(sd_bus *bus) { - assert_return(bus, -EINVAL); + if (!bus) + return 0; + assert_return(bus = bus_resolve(bus), -ENOPKG); assert_return(!bus_pid_changed(bus), -ECHILD);