X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=1795ae4ee401bfd451b582157c9bc53bd498e74d;hp=ed719bc5d553ef3b34d5125c38dcd771076ec1a9;hb=becd02a104b8c1634ce914d1d2cd36be932b9b16;hpb=01c76b246be85b5d9c8e99813950fb194c9f714f

diff --git a/types/sequence.c b/types/sequence.c
index ed719bc5..1795ae4e 100644
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -16,10 +16,19 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <inttypes.h>
 
 static
@@ -30,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);
@@ -59,13 +68,18 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition)
 
 		str = g_string_new("");
 		g_string_printf(str, "[%" PRIu64 "]", i);
-		(void) g_string_free(str, TRUE);
 		name = g_quark_from_string(str->str);
+		(void) g_string_free(str, TRUE);
 
 		field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
 		*field = sequence_declaration->elem->definition_new(sequence_declaration->elem,
 					  sequence_definition->p.scope,
 					  name, i, NULL);
+	}
+	for (i = 0; i < len; i++) {
+		struct definition **field;
+
+		field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
 		ret = generic_rw(pos, *field);
 		if (ret)
 			return ret;
@@ -79,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);
-	declaration_unref(sequence_declaration->elem);
+	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)
 {
@@ -97,11 +111,11 @@ struct declaration_sequence *
 	declaration = &sequence_declaration->p;
 
 	sequence_declaration->length_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
-	append_scope_path(length, sequence_declaration->length_name);
+	bt_append_scope_path(length, sequence_declaration->length_name);
 
-	declaration_ref(elem_declaration);
+	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;
@@ -124,7 +138,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 	int ret;
 
 	sequence = g_new(struct definition_sequence, 1);
-	declaration_ref(&sequence_declaration->p);
+	bt_declaration_ref(&sequence_declaration->p);
 	sequence->p.declaration = declaration;
 	sequence->declaration = sequence_declaration;
 	sequence->p.ref = 1;
@@ -152,7 +166,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 		printf("[error] Sequence length field should be unsigned.\n");
 		goto error;
 	}
-	definition_ref(len_parent);
+	bt_definition_ref(len_parent);
 
 	sequence->string = NULL;
 	sequence->elems = NULL;
@@ -178,7 +192,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 
 error:
 	free_definition_scope(sequence->p.scope);
-	declaration_unref(&sequence_declaration->p);
+	bt_declaration_unref(&sequence_declaration->p);
 	g_free(sequence);
 	return NULL;
 }
@@ -200,20 +214,20 @@ void _sequence_definition_free(struct definition *definition)
 			field = g_ptr_array_index(sequence->elems, i);
 			field->declaration->definition_free(field);
 		}
+		(void) g_ptr_array_free(sequence->elems, TRUE);
 	}
-	(void) g_ptr_array_free(sequence->elems, TRUE);
-	definition_unref(len_definition);
+	bt_definition_unref(len_definition);
 	free_definition_scope(sequence->p.scope);
-	declaration_unref(sequence->p.declaration);
+	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;