X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-dump.c;h=ddad4183a2f0b704922b73c3e974c203e5abd09d;hp=469f7baaf586c9460c2e13a62741fc3693c6445e;hb=86cb0691b71873c6fe30a103dc98153e2d9ab507;hpb=3310dfd5bdba0e8218eca1eb6c1fa719adc45bb1 diff --git a/src/libsystemd-bus/bus-dump.c b/src/libsystemd-bus/bus-dump.c index 469f7baaf..ddad4183a 100644 --- a/src/libsystemd-bus/bus-dump.c +++ b/src/libsystemd-bus/bus-dump.c @@ -56,15 +56,21 @@ int bus_message_dump(sd_bus_message *m, FILE *f, bool with_header) { if (with_header) { fprintf(f, - "%s%s%sType=%s%s%s Endian=%c Flags=%u Version=%u Serial=%u ", + "%s%s%sType=%s%s%s Endian=%c Flags=%u Version=%u", 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() : "", draw_special_char(DRAW_TRIANGULAR_BULLET), ansi_highlight_off(), ansi_highlight(), bus_message_type_to_string(m->header->type), ansi_highlight_off(), m->header->endian, m->header->flags, - m->header->version, - BUS_MESSAGE_SERIAL(m)); + m->header->version); + + /* Display synthetic message serial number in a more readable + * format than (uint32_t) -1 */ + if (BUS_MESSAGE_SERIAL(m) == 0xFFFFFFFFULL) + fprintf(f, " Serial=-1"); + else + fprintf(f, " Serial=%u", BUS_MESSAGE_SERIAL(m)); if (m->reply_serial != 0) fprintf(f, " ReplySerial=%u", m->reply_serial); @@ -111,7 +117,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, bool with_header) { fprintf(f, " MESSAGE \"%s\" {\n", strempty(m->root_container.signature)); - for(;;) { + for (;;) { _cleanup_free_ char *prefix = NULL; const char *contents = NULL; char type;