Fix: lib-logging.c: use temporary prefix where needed

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

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index a71bbefc42a1dcacd51700ac66b157d78e04d4e3..a1b9a7eab4b2e26119786079598677562cfb0dfc 100644 (file)
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -531,7 +531,7 @@ static inline void format_stream_class(char **buf_ch, bool extended,
        SET_TMP_PREFIX("trace-class-");
        format_trace_class(buf_ch, false, tmp_prefix, trace_class);
        SET_TMP_PREFIX("pcf-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &stream_class->packet_context_field_pool);
 }
 
@@ -587,7 +587,8 @@ static inline void format_event_class(char **buf_ch, bool extended,
        SET_TMP_PREFIX("trace-class-");
        format_trace_class(buf_ch, false, tmp_prefix, trace_class);
        SET_TMP_PREFIX("event-pool-");
-       format_object_pool(buf_ch, extended, prefix, &event_class->event_pool);
+       format_object_pool(buf_ch, extended, tmp_prefix,
+               &event_class->event_pool);
 }
 
 static inline void format_stream(char **buf_ch, bool extended,
@@ -630,7 +631,7 @@ static inline void format_stream(char **buf_ch, bool extended,
        }
 
        SET_TMP_PREFIX("packet-pool-");
-       format_object_pool(buf_ch, extended, prefix, &stream->packet_pool);
+       format_object_pool(buf_ch, extended, tmp_prefix, &stream->packet_pool);
 }
 
 static inline void format_packet(char **buf_ch, bool extended,
@@ -756,16 +757,17 @@ static inline void format_clock_class(char **buf_ch, bool extended,
 
        BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", "
                "%soffset-s=%" PRId64 ", "
-               "%soffset-cycles=%" PRIu64 ", %sis-absolute=%d, "
+               "%soffset-cycles=%" PRIu64 ", %sorigin-is-unix-epoch=%d, "
                "%sbase-offset-ns=%" PRId64,
                PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision),
                PRFIELD(clock_class->offset_seconds),
                PRFIELD(clock_class->offset_cycles),
-               PRFIELD(clock_class->is_absolute),
+               PRFIELD(clock_class->origin_is_unix_epoch),
                PRFIELD(clock_class->base_offset.value_ns));
 
        SET_TMP_PREFIX("cs-pool-");
-       format_object_pool(buf_ch, extended, prefix, &clock_class->cs_pool);
+       format_object_pool(buf_ch, extended, tmp_prefix,
+               &clock_class->cs_pool);
 }
 
 static inline void format_clock_snapshot(char **buf_ch, bool extended,
@@ -1109,13 +1111,13 @@ static inline void format_graph(char **buf_ch, bool extended,
        }
 
        SET_TMP_PREFIX("en-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &graph->event_msg_pool);
        SET_TMP_PREFIX("pbn-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &graph->packet_begin_msg_pool);
        SET_TMP_PREFIX("pen-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &graph->packet_end_msg_pool);
 }