Rename "declaration" to "definition"

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index 40deeb2b6f969a2d45ef353359488b1f0c718c93..41dd7751febf1065cb24b407de55c7f492841c49 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -22,17 +22,17 @@
 #include <stdint.h>
 
 static
-struct declaration *_integer_declaration_new(struct type *type,
-                              struct declaration_scope *parent_scope);
+struct definition *_integer_definition_new(struct type *type,
+                              struct definition_scope *parent_scope);
 static
-void _integer_declaration_free(struct declaration *declaration);
+void _integer_definition_free(struct definition *definition);
 
 void integer_copy(struct stream_pos *dest, const struct format *fdest, 
                  struct stream_pos *src, const struct format *fsrc,
-                 struct declaration *declaration)
+                 struct definition *definition)
 {
-       struct declaration_integer *integer =
-               container_of(type, struct declaration_integer, p);
+       struct definition_integer *integer =
+               container_of(definition, struct definition_integer, p);
        struct type_integer *integer_type = integer->type;
 
        if (!integer_type->signedness) {
@@ -61,51 +61,45 @@ struct type_integer *
                         int signedness, size_t alignment)
 {
        struct type_integer *integer_type;
-       int ret;
 
        integer_type = g_new(struct type_integer, 1);
+       integer_type->p.id = CTF_TYPE_INTEGER;
        integer_type->p.name = g_quark_from_string(name);
        integer_type->p.alignment = alignment;
        integer_type->p.copy = integer_copy;
        integer_type->p.type_free = _integer_type_free;
-       integer_type->p.declaration_free = _integer_declaration_free;
-       integer_type->p.declaration_new = _integer_declaration_new;
+       integer_type->p.definition_free = _integer_definition_free;
+       integer_type->p.definition_new = _integer_definition_new;
        integer_type->p.ref = 1;
        integer_type->len = len;
        integer_type->byte_order = byte_order;
        integer_type->signedness = signedness;
-       if (integer_type->p.name) {
-               ret = register_type(&integer_type->p);
-               if (ret) {
-                       g_free(integer_type);
-                       return NULL;
-               }
-       }
        return integer_type;
 }
 
 static
-struct declaration *
-       _integer_declaration_new(struct type *type,
-                                struct declaration_scope *parent_scope)
+struct definition *
+       _integer_definition_new(struct type *type,
+                               struct definition_scope *parent_scope)
 {
        struct type_integer *integer_type =
                container_of(type, struct type_integer, p);
-       struct declaration_integer *integer;
+       struct definition_integer *integer;
 
-       integer = g_new(struct declaration_integer, 1);
+       integer = g_new(struct definition_integer, 1);
        type_ref(&integer_type->p);
-       integer->p.type = integer_type;
+       integer->p.type = type;
+       integer->type = integer_type;
        integer->p.ref = 1;
        integer->value._unsigned = 0;
        return &integer->p;
 }
 
 static
-void _integer_declaration_free(struct declaration *declaration)
+void _integer_definition_free(struct definition *definition)
 {
-       struct declaration_integer *integer =
-               container_of(declaration, struct declaration_integer, p);
+       struct definition_integer *integer =
+               container_of(definition, struct definition_integer, p);
 
        type_unref(integer->p.type);
        g_free(integer);