X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Fsequence.c;h=2646cef493b426be12f76c16a96d9c1c05be9b30;hb=2b77e6a6ff6a0b46ee3bd607d1d75f2d20af5ea0;hp=736e866439bfbcf90b17df5be9a6ffe000da2eec;hpb=13fad8b6d8ad53a55baca25234a0c59aeff83a3b;p=babeltrace.git

diff --git a/types/sequence.c b/types/sequence.c
index 736e8664..2646cef4 100644
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -39,7 +39,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 static
 void _sequence_definition_free(struct definition *definition);
 
-int sequence_rw(struct stream_pos *pos, struct definition *definition)
+int bt_sequence_rw(struct stream_pos *pos, struct definition *definition)
 {
 	struct definition_sequence *sequence_definition =
 		container_of(definition, struct definition_sequence, p);
@@ -93,14 +93,14 @@ void _sequence_declaration_free(struct declaration *declaration)
 	struct declaration_sequence *sequence_declaration =
 		container_of(declaration, struct declaration_sequence, p);
 
-	free_declaration_scope(sequence_declaration->scope);
+	bt_free_declaration_scope(sequence_declaration->scope);
 	g_array_free(sequence_declaration->length_name, TRUE);
 	bt_declaration_unref(sequence_declaration->elem);
 	g_free(sequence_declaration);
 }
 
 struct declaration_sequence *
-	sequence_declaration_new(const char *length,
+	bt_sequence_declaration_new(const char *length,
 			  struct declaration *elem_declaration,
 			  struct declaration_scope *parent_scope)
 {
@@ -115,7 +115,7 @@ struct declaration_sequence *
 
 	bt_declaration_ref(elem_declaration);
 	sequence_declaration->elem = elem_declaration;
-	sequence_declaration->scope = new_declaration_scope(parent_scope);
+	sequence_declaration->scope = bt_new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_SEQUENCE;
 	declaration->alignment = elem_declaration->alignment;
 	declaration->declaration_free = _sequence_declaration_free;
@@ -148,12 +148,12 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 	 */
 	sequence->p.index = root_name ? INT_MAX : index;
 	sequence->p.name = field_name;
-	sequence->p.path = new_definition_path(parent_scope, field_name, root_name);
-	sequence->p.scope = new_definition_scope(parent_scope, field_name, root_name);
-	ret = register_field_definition(field_name, &sequence->p,
+	sequence->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+	sequence->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
+	ret = bt_register_field_definition(field_name, &sequence->p,
 					parent_scope);
 	assert(!ret);
-	len_parent = lookup_path_definition(sequence->p.scope->scope_path,
+	len_parent = bt_lookup_path_definition(sequence->p.scope->scope_path,
 					    sequence_declaration->length_name,
 					    parent_scope);
 	if (!len_parent) {
@@ -191,7 +191,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 	return &sequence->p;
 
 error:
-	free_definition_scope(sequence->p.scope);
+	bt_free_definition_scope(sequence->p.scope);
 	bt_declaration_unref(&sequence_declaration->p);
 	g_free(sequence);
 	return NULL;
@@ -217,17 +217,17 @@ void _sequence_definition_free(struct definition *definition)
 		(void) g_ptr_array_free(sequence->elems, TRUE);
 	}
 	bt_definition_unref(len_definition);
-	free_definition_scope(sequence->p.scope);
+	bt_free_definition_scope(sequence->p.scope);
 	bt_declaration_unref(sequence->p.declaration);
 	g_free(sequence);
 }
 
-uint64_t sequence_len(struct definition_sequence *sequence)
+uint64_t bt_sequence_len(struct definition_sequence *sequence)
 {
 	return sequence->length->value._unsigned;
 }
 
-struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i)
+struct definition *bt_sequence_index(struct definition_sequence *sequence, uint64_t i)
 {
 	if (!sequence->elems)
 		return NULL;