X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fclock-fields.c;h=1e28c899327d457d2cbf6a69c1125baaf5927953;hp=0096527e98ea7c6251840215168e34493f265596;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hpb=05e2128659970c32648a01255ed870449f05d518

diff --git a/plugins/libctfcopytrace/clock-fields.c b/plugins/libctfcopytrace/clock-fields.c
index 0096527e..1e28c899 100644
--- a/plugins/libctfcopytrace/clock-fields.c
+++ b/plugins/libctfcopytrace/clock-fields.c
@@ -37,54 +37,54 @@
 
 static
 int find_update_struct_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class);
+		const struct bt_clock_class *writer_clock_class);
 static
 int find_update_array_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class);
+		const struct bt_clock_class *writer_clock_class);
 static
 int find_update_enum_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class);
+		const struct bt_clock_class *writer_clock_class);
 static
 int find_update_sequence_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class);
+		const struct bt_clock_class *writer_clock_class);
 static
 int find_update_variant_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class);
+		const struct bt_clock_class *writer_clock_class);
 
 static
 int copy_find_clock_int_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field);
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field);
 static
 int copy_find_clock_struct_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field);
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field);
 static
 int copy_find_clock_array_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field);
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field);
 static
 int copy_find_clock_sequence_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field);
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field);
 static
-int copy_find_clock_variant_field(FILE *err, struct bt_event *event,
-		struct bt_event *writer_event, struct bt_field *field,
-		struct bt_field_type *type, struct bt_field *copy_field);
+int copy_find_clock_variant_field(FILE *err, const struct bt_event *event,
+		const struct bt_event *writer_event, const struct bt_field *field,
+		struct bt_field_type *type, const struct bt_field *copy_field);
 static
-int copy_find_clock_enum_field(FILE *err, struct bt_event *event,
-		struct bt_event *writer_event, struct bt_field *field,
-		struct bt_field_type *type, struct bt_field *copy_field);
+int copy_find_clock_enum_field(FILE *err, const struct bt_event *event,
+		const struct bt_event *writer_event, const struct bt_field *field,
+		struct bt_field_type *type, const struct bt_field *copy_field);
 
 static
 int update_header_clock_int_field_type(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
-	struct bt_clock_class *clock = NULL;
+	const struct bt_clock_class *clock = NULL;
 	int ret;
 
 	clock = bt_field_type_integer_get_mapped_clock_class(type);
@@ -112,7 +112,7 @@ end:
 
 static
 int find_update_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
 	int ret;
 
@@ -147,7 +147,7 @@ int find_update_clock_fields(FILE *err, struct bt_field_type *type,
 
 static
 int find_update_variant_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
 	int count, i, ret;
 	struct bt_field_type *entry_type = NULL;
@@ -184,7 +184,7 @@ end:
 
 static
 int find_update_struct_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
 	int count, i, ret;
 	struct bt_field_type *entry_type = NULL;
@@ -220,7 +220,7 @@ end:
 
 static
 int find_update_sequence_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
 	int ret;
 	struct bt_field_type *entry_type = NULL;
@@ -246,7 +246,7 @@ end:
 
 static
 int find_update_array_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
 	int ret = 0;
 	struct bt_field_type *entry_type = NULL;
@@ -268,7 +268,7 @@ end:
 
 static
 int find_update_enum_clock_fields(FILE *err, struct bt_field_type *type,
-		struct bt_clock_class *writer_clock_class)
+		const struct bt_clock_class *writer_clock_class)
 {
 	int ret;
 	struct bt_field_type *entry_type = NULL;
@@ -295,10 +295,10 @@ end:
 BT_HIDDEN
 struct bt_field_type *override_header_type(FILE *err,
 		struct bt_field_type *type,
-		struct bt_trace *writer_trace)
+		const struct bt_trace *writer_trace)
 {
 	struct bt_field_type *new_type = NULL;
-	struct bt_clock_class *writer_clock_class = NULL;
+	const struct bt_clock_class *writer_clock_class = NULL;
 	int ret;
 
 	/* FIXME multi-clock? */
@@ -334,9 +334,9 @@ end:
 }
 
 static
-int copy_float_field(FILE *err, struct bt_field *field,
+int copy_float_field(FILE *err, const struct bt_field *field,
 		struct bt_field_type *type,
-		struct bt_field *copy_field)
+		const struct bt_field *copy_field)
 {
 	double value;
 	int ret;
@@ -364,9 +364,9 @@ end:
 }
 
 static
-int copy_string_field(FILE *err, struct bt_field *field,
+int copy_string_field(FILE *err, const struct bt_field *field,
 		struct bt_field_type *type,
-		struct bt_field *copy_field)
+		const struct bt_field *copy_field)
 {
 	const char *value;
 	int ret;
@@ -394,9 +394,9 @@ end:
 }
 
 BT_HIDDEN
-int copy_override_field(FILE *err, struct bt_event *event,
-		struct bt_event *writer_event, struct bt_field *field,
-		struct bt_field *copy_field)
+int copy_override_field(FILE *err, const struct bt_event *event,
+		const struct bt_event *writer_event, const struct bt_field *field,
+		const struct bt_field *copy_field)
 {
 	struct bt_field_type *type = NULL;
 	int ret = 0;
@@ -447,12 +447,12 @@ int copy_override_field(FILE *err, struct bt_event *event,
 }
 
 static
-int copy_find_clock_enum_field(FILE *err, struct bt_event *event,
-		struct bt_event *writer_event, struct bt_field *field,
-		struct bt_field_type *type, struct bt_field *copy_field)
+int copy_find_clock_enum_field(FILE *err, const struct bt_event *event,
+		const struct bt_event *writer_event, const struct bt_field *field,
+		struct bt_field_type *type, const struct bt_field *copy_field)
 {
 	int ret;
-	struct bt_field *container = NULL, *copy_container = NULL;
+	const struct bt_field *container = NULL, *copy_container = NULL;
 
 	container = bt_field_enumeration_get_container(field);
 	BT_ASSERT(container);
@@ -480,13 +480,13 @@ end:
 }
 
 static
-int copy_find_clock_variant_field(FILE *err, struct bt_event *event,
-		struct bt_event *writer_event, struct bt_field *field,
-		struct bt_field_type *type, struct bt_field *copy_field)
+int copy_find_clock_variant_field(FILE *err, const struct bt_event *event,
+		const struct bt_event *writer_event, const struct bt_field *field,
+		struct bt_field_type *type, const struct bt_field *copy_field)
 {
 	int ret;
-	struct bt_field *tag = NULL;
-	struct bt_field *variant_field = NULL, *copy_variant_field = NULL;
+	const struct bt_field *tag = NULL;
+	const struct bt_field *variant_field = NULL, *copy_variant_field = NULL;
 
 	tag = bt_field_variant_get_tag(field);
 	BT_ASSERT(tag);
@@ -521,14 +521,14 @@ end:
 
 static
 int copy_find_clock_sequence_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field)
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field)
 {
 	int ret;
 	uint64_t i, count;
-	struct bt_field *length_field = NULL;
-	struct bt_field *entry_field = NULL, *entry_copy = NULL;
+	const struct bt_field *length_field = NULL;
+	const struct bt_field *entry_field = NULL, *entry_copy = NULL;
 
 	length_field = bt_field_sequence_get_length(field);
 	BT_ASSERT(length_field);
@@ -580,12 +580,12 @@ end:
 
 static
 int copy_find_clock_array_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field)
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field)
 {
 	int ret, count, i;
-	struct bt_field *entry_field = NULL, *entry_copy = NULL;
+	const struct bt_field *entry_field = NULL, *entry_copy = NULL;
 
 	count = bt_field_type_array_get_length(type);
 	for (i = 0; i < count; i++) {
@@ -623,13 +623,13 @@ end:
 
 static
 int copy_find_clock_struct_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field)
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field)
 {
 	int count, i, ret;
 	struct bt_field_type *entry_type = NULL;
-	struct bt_field *entry_field = NULL, *entry_copy = NULL;
+	const struct bt_field *entry_field = NULL, *entry_copy = NULL;
 
 	count = bt_field_type_structure_get_field_count(type);
 	for (i = 0; i < count; i++) {
@@ -675,8 +675,8 @@ end:
 }
 
 static
-int set_int_value(FILE *err, struct bt_field *field,
-		struct bt_field *copy_field,
+int set_int_value(FILE *err, const struct bt_field *field,
+		const struct bt_field *copy_field,
 		struct bt_field_type *type)
 {
 	uint64_t uvalue;
@@ -720,11 +720,11 @@ end:
 	return ret;
 }
 
-struct bt_clock_class *stream_class_get_clock_class(FILE *err,
-		struct bt_stream_class *stream_class)
+const struct bt_clock_class *stream_class_get_clock_class(FILE *err,
+		const struct bt_stream_class *stream_class)
 {
-	struct bt_trace *trace = NULL;
-	struct bt_clock_class *clock_class = NULL;
+	const struct bt_trace *trace = NULL;
+	const struct bt_clock_class *clock_class = NULL;
 
 	trace = bt_stream_class_get_trace(stream_class);
 	BT_ASSERT(trace);
@@ -737,11 +737,11 @@ struct bt_clock_class *stream_class_get_clock_class(FILE *err,
 	return clock_class;
 }
 
-struct bt_clock_class *event_get_clock_class(FILE *err, struct bt_event *event)
+const struct bt_clock_class *event_get_clock_class(FILE *err, const struct bt_event *event)
 {
-	struct bt_event_class *event_class = NULL;
-	struct bt_stream_class *stream_class = NULL;
-	struct bt_clock_class *clock_class = NULL;
+	const struct bt_event_class *event_class = NULL;
+	const struct bt_stream_class *stream_class = NULL;
+	const struct bt_clock_class *clock_class = NULL;
 
 	event_class = bt_event_get_class(event);
 	BT_ASSERT(event_class);
@@ -758,11 +758,11 @@ struct bt_clock_class *event_get_clock_class(FILE *err, struct bt_event *event)
 
 static
 int copy_find_clock_int_field(FILE *err,
-		struct bt_event *event, struct bt_event *writer_event,
-		struct bt_field *field, struct bt_field_type *type,
-		struct bt_field *copy_field)
+		const struct bt_event *event, const struct bt_event *writer_event,
+		const struct bt_field *field, struct bt_field_type *type,
+		const struct bt_field *copy_field)
 {
-	struct bt_clock_class *clock_class = NULL, *writer_clock_class = NULL;
+	const struct bt_clock_class *clock_class = NULL, *writer_clock_class = NULL;
 	struct bt_clock_value *clock_value = NULL, *writer_clock_value = NULL;
 	uint64_t value;
 	int ret;