system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-14 20:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-bus: make sd_bus_is_{ready,open} accept NULL

Browse source 
We didn't document this behaviour one way or another, so I think it's
OK to change. All callers do the NULL check before callling this to avoid
the assert warning, so it seems reasonable to do it internally.

sd_bus_can_send() is similar, but there we expressly say that an
error is returned on NULL, so I didn't change it.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-04-08 14:59:10 +02:00
parent a73f8e9f32
commit 3bbb76f621
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
man/sd_bus_is_open.xml
View file

@ -57,6 +57,9 @@
zero outside of this state, and positive otherwise. Effectively, this function returns positive while regular zero outside of this state, and positive otherwise. Effectively, this function returns positive while regular
messages can be sent or received on the connection.</para> messages can be sent or received on the connection.</para>
<para>The <parameter>bus</parameter> argument may be <constant>NULL</constant>, zero is also returned in
that case.</para>
<para>To be notified when the connection is fully established, use <para>To be notified when the connection is fully established, use
<citerefentry><refentrytitle>sd_bus_set_connected_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry> and <citerefentry><refentrytitle>sd_bus_set_connected_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
install a match for the <function>Connected()</function> signal on the install a match for the <function>Connected()</function> signal on the
@ -68,8 +71,8 @@
<refsect1> <refsect1>
<title>Return Value</title> <title>Return Value</title>
<para>On success, these functions return 0 or a positive integer. On failure, they return a negative errno-style <para>Those functions return 0 if the bus is <emphasis>not</emphasis> in the given state, and a positive
error code.</para> integer when it is. On failure, a negative errno-style error code is returned.</para>
<refsect2> <refsect2>
<title>Errors</title> <title>Errors</title>

8
src/libsystemd/sd-bus/sd-bus.c
View file

@ -1800,7 +1800,9 @@ void bus_enter_closing(sd_bus *bus) {
DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus, sd_bus, bus_free); DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus, sd_bus, bus_free);
_public_ int sd_bus_is_open(sd_bus *bus) { _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 = bus_resolve(bus), -ENOPKG);
assert_return(!bus_pid_changed(bus), -ECHILD); 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) { _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 = bus_resolve(bus), -ENOPKG);
assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(!bus_pid_changed(bus), -ECHILD);