Fix missing header

[babeltrace.git] / types / array.c

diff --git a/types/array.c b/types/array.c
index d8ddd637c69bb804e5401e8276da9ba22a69969d..cd7b31bf2724e8aedab636be99dd0cc0bcc1133f 100644 (file)
--- a/types/array.c
+++ b/types/array.c
@@ -27,27 +27,20 @@ struct definition *_array_definition_new(struct declaration *declaration,
 static
 void _array_definition_free(struct definition *definition);
 
-void array_copy(struct stream_pos *dest, const struct format *fdest, 
-               struct stream_pos *src, const struct format *fsrc,
-               struct definition *definition)
+void array_rw(struct stream_pos *pos, struct definition *definition)
 {
-       struct definition_array *array =
+       struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
-       struct declaration_array *array_declaration = array->declaration;
+       const struct declaration_array *array_declaration =
+               array_definition->declaration;
        uint64_t i;
 
-       fsrc->array_begin(src, array_declaration);
-       if (fdest)
-               fdest->array_begin(dest, array_declaration);
-
+       /* No need to align, because the first field will align itself. */
        for (i = 0; i < array_declaration->len; i++) {
                struct definition *elem =
-                       g_array_index(array->elems, struct field, i).definition;
-               elem->declaration->copy(dest, fdest, src, fsrc, elem);
+                       g_array_index(array_definition->elems, struct field, i).definition;
+               generic_rw(pos, elem);
        }
-       fsrc->array_end(src, array_declaration);
-       if (fdest)
-               fdest->array_end(dest, array_declaration);
 }
 
 static
@@ -78,7 +71,6 @@ struct declaration_array *
        declaration->id = CTF_TYPE_ARRAY;
        /* No need to align the array, the first element will align itself */
        declaration->alignment = 1;
-       declaration->copy = array_copy;
        declaration->declaration_free = _array_declaration_free;
        declaration->definition_new = _array_definition_new;
        declaration->definition_free = _array_definition_free;
@@ -145,6 +137,11 @@ void _array_definition_free(struct definition *definition)
        g_free(array);
 }
 
+uint64_t array_len(struct definition_array *array)
+{
+       return array->elems->len;
+}
+
 struct definition *array_index(struct definition_array *array, uint64_t i)
 {
        if (i >= array->elems->len)