diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-02 00:46:20 +0200 |
|---|---|---|
| committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-05-03 12:50:30 +0200 |
| commit | 625795e6214ae7c7f0f7f35b2c1f53e1e173b1ad (patch) | |
| tree | 4fbfb6a1882dcd8cff1d205cbf8bd9047580b839 | |
| parent | 5d6a8b1b9728cfa54c89441a089ffbb156b59648 (diff) | |
| download | systemd-625795e6214ae7c7f0f7f35b2c1f53e1e173b1ad.tar.gz | |
bus: do not print (null) if the message has unknown type
(cherry picked from commit e8fd7e4b5b5269377efc641a7da43850822c1250)
Resolves: #1696224
| -rw-r--r-- | src/libsystemd/sd-bus/bus-dump.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 3a28c7c6e3..2bd06053a6 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -59,8 +59,14 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) { "%s%s%s Type=%s%s%s Endian=%c Flags=%u Version=%u Priority=%"PRIi64, m->header->type == SD_BUS_MESSAGE_METHOD_ERROR ? ansi_highlight_red() : m->header->type == SD_BUS_MESSAGE_METHOD_RETURN ? ansi_highlight_green() : - m->header->type != SD_BUS_MESSAGE_SIGNAL ? ansi_highlight() : "", special_glyph(TRIANGULAR_BULLET), ansi_normal(), - ansi_highlight(), bus_message_type_to_string(m->header->type), ansi_normal(), + m->header->type != SD_BUS_MESSAGE_SIGNAL ? ansi_highlight() : "", + special_glyph(TRIANGULAR_BULLET), + ansi_normal(), + + ansi_highlight(), + bus_message_type_to_string(m->header->type) ?: "(unknown)", + ansi_normal(), + m->header->endian, m->header->flags, m->header->version, |