X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fctf-writer%2Fclock.c;h=5afe3fd540d3732abefca463e38c7de420f2773f;hp=0549ee0a5b6c7c7556df75acaf3c4db403b9a3bd;hb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;hpb=6606e9c14a9fc2c1b3edd81cb52c5bb15f07f855

diff --git a/lib/ctf-writer/clock.c b/lib/ctf-writer/clock.c
index 0549ee0a..5afe3fd5 100644
--- a/lib/ctf-writer/clock.c
+++ b/lib/ctf-writer/clock.c
@@ -60,7 +60,7 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 	clock->value = 0;
 
 	/* Pre-2.0.0 backward compatibility: default frequency is 1 GHz */
-	clock->clock_class = bt_ctf_clock_class_create(name, 1000000000);
+	clock->clock_class = bt_clock_class_create(name, 1000000000);
 	if (!clock->clock_class) {
 		goto error;
 	}
@@ -71,7 +71,7 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 		goto error;
 	}
 
-	ret = bt_ctf_clock_class_set_uuid(clock->clock_class, cc_uuid);
+	ret = bt_clock_class_set_uuid(clock->clock_class, cc_uuid);
 	assert(ret == 0);
 	return clock;
 
@@ -85,7 +85,7 @@ const char *bt_ctf_clock_get_name(struct bt_ctf_clock *clock)
 	const char *name = NULL;
 
 	if (clock) {
-		name = bt_ctf_clock_class_get_name(clock->clock_class);
+		name = bt_clock_class_get_name(clock->clock_class);
 	}
 
 	return name;
@@ -96,7 +96,7 @@ const char *bt_ctf_clock_get_description(struct bt_ctf_clock *clock)
 	const char *description = NULL;
 
 	if (clock) {
-		description = bt_ctf_clock_class_get_description(
+		description = bt_clock_class_get_description(
 			clock->clock_class);
 	}
 
@@ -108,7 +108,7 @@ int bt_ctf_clock_set_description(struct bt_ctf_clock *clock, const char *desc)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_description(clock->clock_class,
+		ret = bt_clock_class_set_description(clock->clock_class,
 			desc);
 	}
 
@@ -120,7 +120,7 @@ uint64_t bt_ctf_clock_get_frequency(struct bt_ctf_clock *clock)
 	uint64_t freq = -1ULL;
 
 	if (clock) {
-		freq = bt_ctf_clock_class_get_frequency(clock->clock_class);
+		freq = bt_clock_class_get_frequency(clock->clock_class);
 	}
 
 	return freq;
@@ -131,7 +131,7 @@ int bt_ctf_clock_set_frequency(struct bt_ctf_clock *clock, uint64_t freq)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_frequency(clock->clock_class,
+		ret = bt_clock_class_set_frequency(clock->clock_class,
 			freq);
 	}
 
@@ -143,7 +143,7 @@ uint64_t bt_ctf_clock_get_precision(struct bt_ctf_clock *clock)
 	uint64_t precision = -1ULL;
 
 	if (clock) {
-		precision = bt_ctf_clock_class_get_precision(
+		precision = bt_clock_class_get_precision(
 			clock->clock_class);
 	}
 
@@ -155,7 +155,7 @@ int bt_ctf_clock_set_precision(struct bt_ctf_clock *clock, uint64_t precision)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_precision(clock->clock_class,
+		ret = bt_clock_class_set_precision(clock->clock_class,
 			precision);
 	}
 
@@ -167,7 +167,7 @@ int bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock, int64_t *offset_s)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_get_offset_s(clock->clock_class,
+		ret = bt_clock_class_get_offset_s(clock->clock_class,
 			offset_s);
 	}
 
@@ -179,7 +179,7 @@ int bt_ctf_clock_set_offset_s(struct bt_ctf_clock *clock, int64_t offset_s)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_offset_s(clock->clock_class,
+		ret = bt_clock_class_set_offset_s(clock->clock_class,
 			offset_s);
 	}
 
@@ -191,7 +191,7 @@ int bt_ctf_clock_get_offset(struct bt_ctf_clock *clock, int64_t *offset)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_get_offset_cycles(clock->clock_class,
+		ret = bt_clock_class_get_offset_cycles(clock->clock_class,
 			offset);
 	}
 
@@ -203,7 +203,7 @@ int bt_ctf_clock_set_offset(struct bt_ctf_clock *clock, int64_t offset)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_offset_cycles(clock->clock_class,
+		ret = bt_clock_class_set_offset_cycles(clock->clock_class,
 			offset);
 	}
 
@@ -215,7 +215,7 @@ int bt_ctf_clock_get_is_absolute(struct bt_ctf_clock *clock)
 	int is_absolute = -1;
 
 	if (clock) {
-		is_absolute = bt_ctf_clock_class_is_absolute(
+		is_absolute = bt_clock_class_is_absolute(
 			clock->clock_class);
 	}
 
@@ -227,7 +227,7 @@ int bt_ctf_clock_set_is_absolute(struct bt_ctf_clock *clock, int is_absolute)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_is_absolute(clock->clock_class,
+		ret = bt_clock_class_set_is_absolute(clock->clock_class,
 			is_absolute);
 	}
 
@@ -239,7 +239,7 @@ const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock)
 	const unsigned char *uuid = NULL;
 
 	if (clock) {
-		uuid = bt_ctf_clock_class_get_uuid(clock->clock_class);
+		uuid = bt_clock_class_get_uuid(clock->clock_class);
 	}
 
 	return uuid;
@@ -250,7 +250,7 @@ int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, const unsigned char *uuid)
 	int ret = -1;
 
 	if (clock) {
-		ret = bt_ctf_clock_class_set_uuid(clock->clock_class, uuid);
+		ret = bt_clock_class_set_uuid(clock->clock_class, uuid);
 	}
 
 	return ret;