Add base integer attribute, and use it in ctf-text

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index 7b7d22c8d4b1b48ebe12ed6c80550c1c8fd222dd..059c6d898b7951e31951e35b3bd7e5d3be9eac05 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -28,27 +28,6 @@ struct definition *_integer_definition_new(struct declaration *declaration,
 static
 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 definition *definition)
-{
-       struct definition_integer *integer =
-               container_of(definition, struct definition_integer, p);
-       struct declaration_integer *integer_declaration = integer->declaration;
-
-       if (!integer_declaration->signedness) {
-               uint64_t v;
-
-               v = fsrc->uint_read(src, integer_declaration);
-               fdest->uint_write(dest, integer_declaration, v);
-       } else {
-               int64_t v;
-
-               v = fsrc->int_read(src, integer_declaration);
-               fdest->int_write(dest, integer_declaration, v);
-       }
-}
-
 static
 void _integer_declaration_free(struct declaration *declaration)
 {
@@ -59,14 +38,13 @@ void _integer_declaration_free(struct declaration *declaration)
 
 struct declaration_integer *
        integer_declaration_new(size_t len, int byte_order,
-                        int signedness, size_t alignment)
+                        int signedness, size_t alignment, int base)
 {
        struct declaration_integer *integer_declaration;
 
        integer_declaration = g_new(struct declaration_integer, 1);
        integer_declaration->p.id = CTF_TYPE_INTEGER;
        integer_declaration->p.alignment = alignment;
-       integer_declaration->p.copy = integer_copy;
        integer_declaration->p.declaration_free = _integer_declaration_free;
        integer_declaration->p.definition_free = _integer_definition_free;
        integer_declaration->p.definition_new = _integer_definition_new;
@@ -74,6 +52,7 @@ struct declaration_integer *
        integer_declaration->len = len;
        integer_declaration->byte_order = byte_order;
        integer_declaration->signedness = signedness;
+       integer_declaration->base = base;
        return integer_declaration;
 }
 
@@ -93,6 +72,8 @@ struct definition *
        integer->declaration = integer_declaration;
        integer->p.ref = 1;
        integer->p.index = index;
+       integer->p.name = field_name;
+       integer->p.path = new_definition_path(parent_scope, field_name);
        integer->value._unsigned = 0;
        return &integer->p;
 }