X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fctfcopytrace.c;h=b833fcdafb971c79fe8db27a12faaeace34de25e;hb=4cdfc5e86b64137d96c31495cbdea99801714c2b;hp=140a7ad8797c9fd5c7eedc71dd253af935cd0573;hpb=b19ff26f04df428047676dd736bd7cc9473906fe;p=babeltrace.git

diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c
index 140a7ad8..b833fcda 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.c
+++ b/plugins/libctfcopytrace/ctfcopytrace.c
@@ -94,12 +94,12 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status ctf_copy_clock_classes(FILE *err,
+bt_component_status ctf_copy_clock_classes(FILE *err,
 		const bt_trace *writer_trace,
 		const bt_stream_class *writer_stream_class,
 		const bt_trace *trace)
 {
-	enum bt_component_status ret;
+	bt_component_status ret;
 	int int_ret, clock_class_count, i;
 
 	clock_class_count = bt_trace_get_clock_class_count(trace);
@@ -255,7 +255,7 @@ const bt_event_class *ctf_copy_event_class(FILE *err,
 	const char *name;
 	int ret;
 	int64_t id;
-	enum bt_event_class_log_level log_level;
+	bt_event_class_log_level log_level;
 	const char *emf_uri;
 
 	name = bt_event_class_get_name(event_class);
@@ -342,11 +342,11 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status ctf_copy_event_classes(FILE *err,
+bt_component_status ctf_copy_event_classes(FILE *err,
 		const bt_stream_class *stream_class,
 		const bt_stream_class *writer_stream_class)
 {
-	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+	bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	const bt_event_class *event_class = NULL, *writer_event_class = NULL;
 	int count, i;
 	const bt_trace *writer_trace =
@@ -655,7 +655,7 @@ int ctf_copy_event_header(FILE *err, const bt_event *event,
 		const bt_field *event_header)
 {
 	const bt_clock_class *clock_class = NULL, *writer_clock_class = NULL;
-	bt_clock_value *clock_value = NULL, *writer_clock_value = NULL;
+	bt_clock_snapshot *clock_snapshot = NULL, *writer_clock_snapshot = NULL;
 
 	int ret;
 	const bt_field *writer_event_header = NULL;
@@ -667,12 +667,12 @@ int ctf_copy_event_header(FILE *err, const bt_event *event,
 		goto error;
 	}
 
-	clock_value = bt_event_get_clock_value(event, clock_class);
+	clock_snapshot = bt_event_get_clock_snapshot(event, clock_class);
 	BT_CLOCK_CLASS_PUT_REF_AND_RESET(clock_class);
-	BT_ASSERT(clock_value);
+	BT_ASSERT(clock_snapshot);
 
-	ret = bt_clock_value_get_value(clock_value, &value);
-	BT_OBJECT_PUT_REF_AND_RESET(clock_value);
+	ret = bt_clock_snapshot_get_value(clock_snapshot, &value);
+	BT_OBJECT_PUT_REF_AND_RESET(clock_snapshot);
 	if (ret) {
 		BT_LOGE_STR("Failed to get clock value.");
 		goto error;
@@ -684,15 +684,15 @@ int ctf_copy_event_header(FILE *err, const bt_event *event,
 		goto error;
 	}
 
-	writer_clock_value = bt_clock_value_create(writer_clock_class, value);
+	writer_clock_snapshot = bt_clock_snapshot_create(writer_clock_class, value);
 	BT_CLOCK_CLASS_PUT_REF_AND_RESET(writer_clock_class);
-	if (!writer_clock_value) {
+	if (!writer_clock_snapshot) {
 		BT_LOGE_STR("Failed to create clock value.");
 		goto error;
 	}
 
-	ret = bt_event_set_clock_value(writer_event, writer_clock_value);
-	BT_OBJECT_PUT_REF_AND_RESET(writer_clock_value);
+	ret = bt_event_set_clock_snapshot(writer_event, writer_clock_snapshot);
+	BT_OBJECT_PUT_REF_AND_RESET(writer_clock_snapshot);
 	if (ret) {
 		BT_LOGE_STR("Failed to set clock value.");
 		goto error;
@@ -855,13 +855,13 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status ctf_copy_trace(FILE *err, const bt_trace *trace,
+bt_component_status ctf_copy_trace(FILE *err, const bt_trace *trace,
 		const bt_trace *writer_trace)
 {
-	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+	bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	int field_count, i, int_ret;
 	bt_field_type *header_type = NULL;
-	enum bt_byte_order order;
+	bt_byte_order order;
 	const char *trace_name;
 	const unsigned char *trace_uuid;