lib: create_packet_message(): make assertion message less convoluted

[babeltrace.git] / lib / lib-logging.c

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index 0a988db3d3f2d2c5ec2c9e204a8c00039aaea1a1..683df22eb2d009d1b968f611e18bde28fa85dc61 100644 (file)
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -103,8 +103,9 @@ static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
 #define TMP_PREFIX_LEN 64
 #define SET_TMP_PREFIX(_prefix2)                                       \
        do {                                                            \
-               strncpy(tmp_prefix, prefix, TMP_PREFIX_LEN);            \
-               strncat(tmp_prefix, (_prefix2), TMP_PREFIX_LEN);        \
+               snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s",        \
+                       prefix, (_prefix2));                            \
+               tmp_prefix[TMP_PREFIX_LEN - 1] = '\0';                  \
        } while (0)
 
 static inline void format_component(char **buf_ch, bool extended,
@@ -533,9 +534,13 @@ static inline void format_stream_class(char **buf_ch, bool extended,
                return;
        }
 
-       BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d",
+       BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, "
+               "%spackets-have-default-beginning-cs=%d, "
+               "%spackets-have-default-end-cs=%d, ",
                PRFIELD(stream_class->assigns_automatic_event_class_id),
-               PRFIELD(stream_class->assigns_automatic_stream_id));
+               PRFIELD(stream_class->assigns_automatic_stream_id),
+               PRFIELD(stream_class->packets_have_default_beginning_clock_snapshot),
+               PRFIELD(stream_class->packets_have_default_end_clock_snapshot));
        BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
        SET_TMP_PREFIX("trace-class-");
        format_trace_class(buf_ch, false, tmp_prefix, trace_class);