From d9416f8a82d6afd8219d2dfc84817aa33ca8f3cb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 25 Dec 2013 18:03:05 +0100 Subject: [PATCH] man: document sd_bus_message_get_cookie() --- Makefile-man.am | 7 +++++++ man/sd_bus_request_name.xml | 2 +- src/libsystemd-bus/bus-message.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile-man.am b/Makefile-man.am index df8860a3f..4a0d339ac 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 23d49fb4c..b78303afe 100644 --- a/man/sd_bus_request_name.xml +++ b/man/sd_bus_request_name.xml @@ -208,7 +208,7 @@ Notes The sd_bus_acquire_name() - and sd_bus_release_bame() + and sd_bus_release_name() interfaces are available as shared library, which can be compiled and linked to with the libsystemd-bus pkg-config1 diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c index f16f92780..05cd512df 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; -- 2.30.2