From: Lennart Poettering Date: Wed, 30 May 2018 14:34:06 +0000 (+0200) Subject: bus-slot: for bus slot objects with no explicit description use the match string... X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d853931416364fe06a88b16f4222a42bb47ccca7;p=elogind.git bus-slot: for bus slot objects with no explicit description use the match string as description Let's make debugging a but easier with implicit descriptions for some match objects. --- diff --git a/src/libelogind/sd-bus/bus-slot.c b/src/libelogind/sd-bus/bus-slot.c index 3e592e3a2..34cfdd29e 100644 --- a/src/libelogind/sd-bus/bus-slot.c +++ b/src/libelogind/sd-bus/bus-slot.c @@ -300,8 +300,13 @@ _public_ int sd_bus_slot_set_description(sd_bus_slot *slot, const char *descript _public_ int sd_bus_slot_get_description(sd_bus_slot *slot, const char **description) { assert_return(slot, -EINVAL); assert_return(description, -EINVAL); - assert_return(slot->description, -ENXIO); - *description = slot->description; + if (slot->description) + *description = slot->description; + else if (slot->type == BUS_MATCH_CALLBACK) + *description = slot->match_callback.match_string; + else + return -ENXIO; + return 0; }