From 7a37d62501c97eb3b48a418ef764d0308e0c3fb9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Oct 2013 06:04:20 +0200 Subject: [PATCH 1/1] bus: return 1 on all calls that send messages This way they are nicer to use from method dispatch callbacks as last call, since method dispatch callbacks expect > 0 return if the message got handled. --- src/libsystemd-bus/sd-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index ac886e9d5..5d1fcd90a 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -1231,7 +1231,7 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { /* If this is a reply and no reply was requested, then let's * suppress this, if we can */ if (m->dont_send && !serial) - return 0; + return 1; if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) { size_t idx = 0; @@ -1273,7 +1273,7 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if (serial) *serial = BUS_MESSAGE_SERIAL(m); - return 0; + return 1; } static usec_t calc_elapse(uint64_t usec) { @@ -1482,7 +1482,7 @@ int sd_bus_send_with_reply_and_block( else sd_bus_message_unref(incoming); - return 0; + return 1; } if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) { -- 2.30.2