X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-message.c;h=0c8604c49257e7c2124ff6fd29620212178fec73;hb=843f737ade9c73609a2280dd3dd16e18222a5dcb;hp=f16f92780ba5ffe403312e31dde1d4ce19f0fb93;hpb=693eb9a2d42d71445dad273a76e2470199d1dc5a;p=elogind.git

diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index f16f92780..0c8604c49 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;
@@ -1433,7 +1433,7 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
                                 *stored = (const uint8_t*) a + 4;
 
                 } else if (type == SD_BUS_TYPE_SIGNATURE) {
-                        *(uint8_t*) a = sz - 1;
+                        *(uint8_t*) a = sz - 2;
                         memcpy((uint8_t*) a + 1, p, sz - 1);
 
                         if (stored)