lib: replace trace is_static with destruction listeners

[babeltrace.git] / plugins / lttng-utils / copy.c

diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c
index 71ce63c151f7cc6cbf146d80fa60e890a120af4e..918e6e17bb8050b4ab66ee1e40b789acda0e1ad6 100644 (file)
--- a/plugins/lttng-utils/copy.c
+++ b/plugins/lttng-utils/copy.c
@@ -440,7 +440,7 @@ struct debug_info *insert_new_debug_info(struct debug_info_iterator *debug_it,
        struct debug_info *debug_info = NULL;
        bt_value *field = NULL;
        const char *str_value;
-       enum bt_value_status ret;
+       bt_value_status ret;
 
        field = bt_trace_get_environment_field_value_by_name(writer_trace,
                        "domain");
@@ -592,7 +592,7 @@ int sync_event_classes(struct debug_info_iterator *debug_it,
        int int_ret;
        const bt_stream_class *stream_class = NULL,
                                   *writer_stream_class = NULL;
-       enum bt_component_status ret;
+       bt_component_status ret;
 
        stream_class = bt_stream_get_class(stream);
        BT_ASSERT(stream_class);
@@ -1065,7 +1065,7 @@ const bt_stream_class *insert_new_stream_class(
        const bt_stream_class *writer_stream_class = NULL;
        const bt_trace *trace, *writer_trace = NULL;
        struct debug_info_trace *di_trace;
-       enum bt_component_status ret;
+       bt_component_status ret;
        int int_ret;
 
        trace = bt_stream_class_get_trace(stream_class);
@@ -1413,7 +1413,7 @@ const bt_stream *debug_info_stream_end(struct debug_info_iterator *debug_it,
                goto error;
        }
        /*
-        * Take the ref on the stream and keep it until the notification
+        * Take the ref on the stream and keep it until the message
         * is created.
         */
        bt_stream_get_ref(writer_stream);
@@ -1721,11 +1721,11 @@ end:
 }
 
 static
-int set_event_clock_value(FILE *err, const bt_event *event,
+int set_event_clock_snapshot(FILE *err, const bt_event *event,
                const bt_event *writer_event)
 {
        const bt_clock_class *clock_class = NULL;
-       bt_clock_value *clock_value = NULL;
+       bt_clock_snapshot *clock_snapshot = NULL;
        int ret = 0;
 
        clock_class = event_get_clock_class(err, event);
@@ -1734,8 +1734,8 @@ int set_event_clock_value(FILE *err, const bt_event *event,
                goto end;
        }
 
-       clock_value = bt_event_get_clock_value(event, clock_class);
-       if (!clock_value) {
+       clock_snapshot = bt_event_get_clock_snapshot(event, clock_class);
+       if (!clock_snapshot) {
                ret = 0;
                goto end;
        }
@@ -1744,7 +1744,7 @@ int set_event_clock_value(FILE *err, const bt_event *event,
         * We share the same clocks, so we can assign the clock value to the
         * writer event.
         */
-       ret = bt_event_set_clock_value(writer_event, clock_value);
+       ret = bt_event_set_clock_snapshot(writer_event, clock_snapshot);
        if (ret) {
                BT_LOGE_STR("Failed to set clock value.");
                goto error;
@@ -1757,7 +1757,7 @@ error:
        ret = -1;
 end:
        bt_clock_class_put_ref(clock_class);
-       bt_object_put_ref(clock_value);
+       bt_object_put_ref(clock_snapshot);
        return ret;
 }
 
@@ -1777,7 +1777,7 @@ const bt_event *debug_info_copy_event(FILE *err, const bt_event *event,
                goto error;
        }
 
-       ret = set_event_clock_value(err, event, writer_event);
+       ret = set_event_clock_snapshot(err, event, writer_event);
        if (ret) {
                BT_LOGE_STR("Failed to set clock value.");
                goto error;