X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=5aa9c44f2440ae93118cc66cd1e1a4143e8c9265;hp=c207079defc661876225e38977fe1c0fcc7bb230;hb=312623540c466defab45503fbe0ce7ec79dcce85;hpb=f66259163f060ada8d0fee348857c968e338ea40

diff --git a/types/integer.c b/types/integer.c
index c207079d..5aa9c44f 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -23,31 +23,11 @@
 
 static
 struct definition *_integer_definition_new(struct declaration *declaration,
-			       struct definition_scope *parent_scope);
+			       struct definition_scope *parent_scope,
+			       GQuark field_name, int index);
 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)
 {
@@ -57,16 +37,14 @@ void _integer_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_integer *
-	integer_declaration_new(const char *name, size_t len, int byte_order,
+	integer_declaration_new(size_t len, int byte_order,
 			 int signedness, size_t alignment)
 {
 	struct declaration_integer *integer_declaration;
 
 	integer_declaration = g_new(struct declaration_integer, 1);
 	integer_declaration->p.id = CTF_TYPE_INTEGER;
-	integer_declaration->p.name = g_quark_from_string(name);
 	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;
@@ -80,7 +58,8 @@ struct declaration_integer *
 static
 struct definition *
 	_integer_definition_new(struct declaration *declaration,
-				struct definition_scope *parent_scope)
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index)
 {
 	struct declaration_integer *integer_declaration =
 		container_of(declaration, struct declaration_integer, p);
@@ -91,6 +70,9 @@ struct definition *
 	integer->p.declaration = declaration;
 	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;
 }