Fix type free memleak

[babeltrace.git] / types / types.c

diff --git a/types/types.c b/types/types.c
index 7aeb74aa002956e03f82203fc07e4f4edb6557d3..675567f8f1819fcb28beb7c52ff911a54606482d 100644 (file)
--- a/types/types.c
+++ b/types/types.c
@@ -25,38 +25,38 @@
 #include <errno.h>
 
 /*
- * Type class hash table contains the registered type classes. Type class
- * registration is typically performed by a plugin.
- * TODO: support plugin unload (unregistration of type classes).
+ * Type hash table contains the registered types. Type registration is typically
+ * performed by a type plugin.
+ * TODO: support plugin unload (unregistration of types).
  */
-GHashTable *type_classes;
+GHashTable *types;
 
-struct type_class *ctf_lookup_type_class(GQuark qname)
+struct type_class *ctf_lookup_type(GQuark qname)
 {
        return g_hash_table_lookup(type_classes,
                                   (gconstpointer) (unsigned long) qname)
 }
 
-int ctf_register_type_class(const char *name,
-                           void (*read)(),
-                           void (*write)())
+static void free_type(struct type_class *type_class)
 {
-       struct type_class tc = g_new(struct type_class, 1);
-       GQuark qname = g_quark_from_string(name);
+       type_class->free(type_class);
+}
 
-       if (ctf_lookup_type_class(qname))
+int ctf_register_type(struct type_class *type_class)
+{
+       if (ctf_lookup_type_class(type_class->name))
                return -EEXIST;
 
        g_hash_table_insert(type_classes,
-                           (gconstpointer) (unsigned long) qname,
-                           tc);
+                           (gconstpointer) (unsigned long) type_class->name,
+                           type_class);
        return 0;
 }
 
 int ctf_init_types(void)
 {
        type_classes = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-                                            NULL, g_free);
+                                            NULL, free_type);
        if (!type_classes)
                return -ENOMEM;
        return 0;