X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=373e4bc4af85ea068a13ddfff22a6e452409c99e;hp=ea292900ce80886141bf21a171ec3b76d2573db8;hb=05628561ca57ff5d269571a72a12cb86854c5f70;hpb=c054553dac076f91196b372fa19efaf2adc4e4f9

diff --git a/types/integer.c b/types/integer.c
index ea292900..373e4bc4 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -22,90 +22,85 @@
 #include <stdint.h>
 
 static
-struct type *_integer_type_new(struct type_class *type_class,
+struct declaration *_integer_declaration_new(struct type *type,
 			       struct declaration_scope *parent_scope);
 static
-void _integer_type_free(struct type *type);
+void _integer_declaration_free(struct declaration *declaration);
 
 void integer_copy(struct stream_pos *dest, const struct format *fdest, 
 		  struct stream_pos *src, const struct format *fsrc,
-		  struct type *type)
+		  struct declaration *declaration)
 {
-	struct type_integer *integer = container_of(type, struct type_integer,
-						    p);
-	struct type_class_integer *int_class = integer->_class;
+	struct declaration_integer *integer =
+		container_of(declaration, struct declaration_integer, p);
+	struct type_integer *integer_type = integer->type;
 
-	if (!int_class->signedness) {
+	if (!integer_type->signedness) {
 		uint64_t v;
 
-		v = fsrc->uint_read(src, int_class);
-		fdest->uint_write(dest, int_class, v);
+		v = fsrc->uint_read(src, integer_type);
+		fdest->uint_write(dest, integer_type, v);
 	} else {
 		int64_t v;
 
-		v = fsrc->int_read(src, int_class);
-		fdest->int_write(dest, int_class, v);
+		v = fsrc->int_read(src, integer_type);
+		fdest->int_write(dest, integer_type, v);
 	}
 }
 
 static
-void _integer_type_class_free(struct type_class *type_class)
+void _integer_type_free(struct type *type)
 {
-	struct type_class_integer *integer_class =
-		container_of(type_class, struct type_class_integer, p);
-	g_free(integer_class);
+	struct type_integer *integer_type =
+		container_of(type, struct type_integer, p);
+	g_free(integer_type);
 }
 
-struct type_class_integer *
-integer_type_class_new(const char *name, size_t len, int byte_order,
-		       int signedness, size_t alignment)
+struct type_integer *
+	integer_type_new(const char *name, size_t len, int byte_order,
+			 int signedness, size_t alignment)
 {
-	struct type_class_integer *int_class;
-	int ret;
+	struct type_integer *integer_type;
 
-	int_class = g_new(struct type_class_integer, 1);
-	int_class->p.name = g_quark_from_string(name);
-	int_class->p.alignment = alignment;
-	int_class->p.copy = integer_copy;
-	int_class->p.class_free = _integer_type_class_free;
-	int_class->p.type_free = _integer_type_free;
-	int_class->p.type_new = _integer_type_new;
-	int_class->p.ref = 1;
-	int_class->len = len;
-	int_class->byte_order = byte_order;
-	int_class->signedness = signedness;
-	if (int_class->p.name) {
-		ret = register_type(&int_class->p);
-		if (ret) {
-			g_free(int_class);
-			return NULL;
-		}
-	}
-	return int_class;
+	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.ref = 1;
+	integer_type->len = len;
+	integer_type->byte_order = byte_order;
+	integer_type->signedness = signedness;
+	return integer_type;
 }
 
 static
-struct type_integer *_integer_type_new(struct type_class *type_class,
-				       struct declaration_scope *parent_scope)
+struct declaration *
+	_integer_declaration_new(struct type *type,
+				 struct declaration_scope *parent_scope)
 {
-	struct type_class_integer *integer_class =
-		container_of(type_class, struct type_class_integer, p);
-	struct type_integer *integer;
+	struct type_integer *integer_type =
+		container_of(type, struct type_integer, p);
+	struct declaration_integer *integer;
 
-	integer = g_new(struct type_integer, 1);
-	type_class_ref(&integer_class->p);
-	integer->p._class = integer_class;
+	integer = g_new(struct declaration_integer, 1);
+	type_ref(&integer_type->p);
+	integer->p.type = type;
+	integer->type = integer_type;
 	integer->p.ref = 1;
 	integer->value._unsigned = 0;
 	return &integer->p;
 }
 
 static
-void _integer_type_free(struct type *type)
+void _integer_declaration_free(struct declaration *declaration)
 {
-	struct type_integer *integer =
-		container_of(type, struct type_integer, p);
+	struct declaration_integer *integer =
+		container_of(declaration, struct declaration_integer, p);
 
-	type_class_unref(integer->p._class);
+	type_unref(integer->p.type);
 	g_free(integer);
 }