X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=bafb6cb7d1c277f7de321513bfbad08c44ce55a4;hp=b338a5913971f86f7787c6a9d4d3a2db4b6778e9;hb=90b676d73fc6f817958083c0f159028a2f0b40ca;hpb=0a46062b3916eda6f871b5d80c4b97dcb3804d37

diff --git a/types/integer.c b/types/integer.c
index b338a591..bafb6cb7 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -20,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 size_t integer_copy(unsigned char *dest, const struct format *fdest, 
@@ -47,6 +48,18 @@ size_t integer_copy(unsigned char *dest, const struct format *fdest,
 	}
 }
 
+void integer_type_free(struct type_class_integer *int_class)
+{
+	g_free(int_class);
+}
+
+static void _integer_type_free(struct type_class *type_class)
+{
+	struct type_class_integer *int_class =
+		container_of(type_class, struct type_class_integer, p);
+	integer_type_free(int_class);
+}
+
 struct type_class_integer *integer_type_new(const char *name,
 					    size_t start_offset,
 					    size_t len, int byte_order,
@@ -56,13 +69,11 @@ struct type_class_integer *integer_type_new(const char *name,
 	struct type_class_integer *int_class;
 	int ret;
 
-	/*
-	 * Freed when type is unregistered.
-	 */
 	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.free = _integer_type_free;
 	int_class->len = len;
 	int_class->byte_order = byte_order;
 	int_class->signedness = signedness;
@@ -75,9 +86,3 @@ struct type_class_integer *integer_type_new(const char *name,
 	}
 	return int_class;
 }
-
-void integer_type_free(struct type_class_integer *int_class)
-{
-	if (!int_class->name)
-		g_free(int_class);
-}