shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

Merge pull request #17350 from poettering/bus-read-array

Browse Source 
sd-bus: initialize return values on success in sd_bus_message_read_ar…
This commit is contained in:
Lennart Poettering 2020-10-14 19:41:01 +02:00 committed by GitHub
commit 21ad331873
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
man/sd_bus_message_read_array.xml
View File

@ -38,16 +38,16 @@
<refsect1>
<title>Description</title>
<para><function>sd_bus_message_read_array()</function> gives access to an element array in
message <parameter>m</parameter>. The "read pointer" in the message must be right before an
array of type <parameter>type</parameter>. As a special case, <parameter>type</parameter> may be
<constant>NUL</constant>, in which case any type is acceptable. A pointer to the array data is
returned in the parameter <parameter>ptr</parameter> and the size of array data (in bytes) is
returned in the parameter <parameter>size</parameter>. If <parameter>size</parameter> is 0, a
valid non-null pointer will be returned, but it may not be dereferenced. The data is aligned as
appropriate for the data type. The data is part of the message — it may not be modified and is
valid only as long as the message is referenced. After this function returns, the "read pointer"
points at the next element after the array.</para>
<para><function>sd_bus_message_read_array()</function> provides access to an array elements in the
bus message <parameter>m</parameter>. The "read pointer" in the message must be right before an array of type
<parameter>type</parameter>. As a special case, <parameter>type</parameter> may be
<constant>NUL</constant>, in which case any trivial type is acceptable. A pointer to the array data is returned
in the parameter <parameter>ptr</parameter> and the size of array data (in bytes) is returned in the
parameter <parameter>size</parameter>. If the returned <parameter>size</parameter> parameter is 0, a
valid non-null pointer will be returned as <parameter>ptr</parameter>, but it may not be
dereferenced. The data is aligned as appropriate for the data type. The data is part of the message — it
may not be modified and is valid only as long as the message is referenced. After this function returns,
the "read pointer" points at the next element after the array.</para>
<para>Note that this function only supports arrays of trivial types, i.e. arrays of booleans, the various
integer types, as well as floating point numbers. In particular it may not be used for arrays of strings,
@ -58,9 +58,12 @@
<title>Return Value</title>
<para>
On success, <function>sd_bus_message_read_array()</function> returns 0 or
a positive integer. On failure, it returns a negative errno-style error
code.
On success and when an array was read, <function>sd_bus_message_read_array()</function> returns an
integer greater than zero. If invoked while inside a container element (such as an array, e.g. when
operating on an array of arrays) and the final element of the outer container has been read already and
the read pointer is thus behind the last element of the outer container this call returns 0 (and the
returned pointer will be <constant>NULL</constant> and the size will be 0). On failure, it returns a
negative errno-style error code.
</para>
<refsect2>

7
src/libsystemd/sd-bus/bus-message.c
View File

@ -4795,8 +4795,13 @@ _public_ int sd_bus_message_read_array(
assert_return(!BUS_MESSAGE_NEED_BSWAP(m), -EOPNOTSUPP);
r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, CHAR_TO_STR(type));
if (r <= 0)
if (r < 0)
return r;
if (r == 0) {
*ptr = NULL;
*size = 0;
return 0;
}
c = message_get_last_container(m);