Remove unneeded declaration "name", work in progress for gen io struct

[babeltrace.git] / types / array.c

diff --git a/types/array.c b/types/array.c
index 7b1d92a5747d54b23b0a1366f0cb5a127159d1a8..c218a11a8bb1a2c66fbf7d0c06d81ba322084ef5 100644 (file)
--- a/types/array.c
+++ b/types/array.c
@@ -21,7 +21,8 @@
 
 static
 struct definition *_array_definition_new(struct declaration *declaration,
-                       struct definition_scope *parent_scope);
+                       struct definition_scope *parent_scope,
+                       GQuark field_name, int index);
 static
 void _array_definition_free(struct definition *definition);
 
@@ -57,7 +58,7 @@ void _array_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_array *
-       array_declaration_new(const char *name, size_t len,
+       array_declaration_new(size_t len,
                              struct declaration *elem_declaration,
                              struct declaration_scope *parent_scope)
 {
@@ -71,7 +72,6 @@ struct declaration_array *
        array_declaration->elem = elem_declaration;
        array_declaration->scope = new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_ARRAY;
-       declaration->name = g_quark_from_string(name);
        /* No need to align the array, the first element will align itself */
        declaration->alignment = 1;
        declaration->copy = array_copy;
@@ -85,7 +85,8 @@ struct declaration_array *
 static
 struct definition *
        _array_definition_new(struct declaration *declaration,
-                             struct definition_scope *parent_scope)
+                             struct definition_scope *parent_scope,
+                             GQuark field_name, int index)
 {
        struct declaration_array *array_declaration =
                container_of(declaration, struct declaration_array, p);
@@ -96,10 +97,13 @@ struct definition *
        array->p.declaration = declaration;
        array->declaration = array_declaration;
        array->p.ref = 1;
-       array->scope = new_definition_scope(parent_scope);
+       array->p.index = index;
+       array->scope = new_definition_scope(parent_scope, field_name);
        array->current_element.definition =
                array_declaration->elem->definition_new(array_declaration->elem,
-                                                 parent_scope);
+                                         parent_scope,
+                                         g_quark_from_static_string("[]"),
+                                         0);
        return &array->p;
 }