summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-25 18:03:05 +0100
committerLennart Poettering <lennart@poettering.net>2013-12-25 18:04:04 +0100
commitd9416f8a82d6afd8219d2dfc84817aa33ca8f3cb (patch)
tree9d94a585fa4cd4334cf7e0722b7b85c590692689
parent693eb9a2d42d71445dad273a76e2470199d1dc5a (diff)
man: document sd_bus_message_get_cookie()
-rw-r--r--Makefile-man.am7
-rw-r--r--man/sd_bus_request_name.xml2
-rw-r--r--src/libsystemd-bus/bus-message.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index df8860a3f0..4a0d339ac2 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -20,6 +20,7 @@ MANPAGES += \
man/sd-id128.3 \
man/sd-journal.3 \
man/sd_booted.3 \
+ man/sd_bus_message_get_cookie.3 \
man/sd_bus_request_name.3 \
man/sd_id128_get_machine.3 \
man/sd_id128_randomize.3 \
@@ -134,6 +135,7 @@ MANPAGES_ALIAS += \
man/init.1 \
man/poweroff.8 \
man/reboot.8 \
+ man/sd_bus_message_get_reply_cookie.3 \
man/sd_bus_release_name.3 \
man/sd_id128_equal.3 \
man/sd_id128_from_string.3 \
@@ -237,6 +239,7 @@ man/SD_WARNING.3: man/sd-daemon.3
man/init.1: man/systemd.1
man/poweroff.8: man/halt.8
man/reboot.8: man/halt.8
+man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
man/sd_bus_release_name.3: man/sd_bus_request_name.3
man/sd_id128_equal.3: man/sd-id128.3
man/sd_id128_from_string.3: man/sd_id128_to_string.3
@@ -396,6 +399,9 @@ man/poweroff.html: man/halt.html
man/reboot.html: man/halt.html
$(html-alias)
+man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
+ $(html-alias)
+
man/sd_bus_release_name.html: man/sd_bus_request_name.html
$(html-alias)
@@ -1106,6 +1112,7 @@ EXTRA_DIST += \
man/sd-login.xml \
man/sd-readahead.xml \
man/sd_booted.xml \
+ man/sd_bus_message_get_cookie.xml \
man/sd_bus_request_name.xml \
man/sd_get_seats.xml \
man/sd_id128_get_machine.xml \
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 23d49fb4ca..b78303afe5 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -208,7 +208,7 @@
<title>Notes</title>
<para>The <function>sd_bus_acquire_name()</function>
- and <function>sd_bus_release_bame()</function>
+ and <function>sd_bus_release_name()</function>
interfaces are available as shared library, which can
be compiled and linked to with the
<constant>libsystemd-bus</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index f16f92780b..05cd512df6 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -816,7 +816,7 @@ _public_ int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type) {
_public_ int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie) {
assert_return(m, -EINVAL);
assert_return(cookie, -EINVAL);
- assert_return(m->header->serial != 0, -ENOENT);
+ assert_return(m->header->serial != 0, -ENODATA);
*cookie = BUS_MESSAGE_COOKIE(m);
return 0;
@@ -825,7 +825,7 @@ _public_ int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie) {
_public_ int sd_bus_message_get_reply_cookie(sd_bus_message *m, uint64_t *cookie) {
assert_return(m, -EINVAL);
assert_return(cookie, -EINVAL);
- assert_return(m->reply_cookie != 0, -ENOENT);
+ assert_return(m->reply_cookie != 0, -ENODATA);
*cookie = m->reply_cookie;
return 0;