module: Split out the GTypeModule subclass.

[upkg.git] / src / module.c

diff --git a/src/module.c b/src/module.c
index 88a7f81b00137b81a57ed2f7030673e32e7bb03f..ffc06e292ad300aaeb0a841d8428ccd8eee7c761 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -25,7 +25,7 @@
 #include <ltdl.h>
 
 #include <uobject/module.h>
-#include "module.h"
+#include <uobject/package.h>
 #include "avl.h"
 
 static unsigned initialized;
@@ -42,82 +42,6 @@ static char *str_cpy_lower(char *dst, const char *src)
        return dst;
 }
 
-G_DEFINE_TYPE(UPkgModule, upkg_module, G_TYPE_TYPE_MODULE);
-
-static void dl_print_errors(const char *prefix)
-{
-       const char *err;
-       while ((err = lt_dlerror())) {
-               if (prefix) fprintf(stderr, "%s: ", prefix);
-               puts(err);
-       }
-}
-
-static gboolean module_load(GTypeModule *m)
-{
-       UPkgModule *mod = UPKG_MODULE(m);
-       int (*init_func)(GTypeModule *);
-
-       mod->dl = lt_dlopenext(G_TYPE_MODULE(m)->name);
-       if (!mod->dl) {
-               dl_print_errors(G_TYPE_MODULE(m)->name);
-               return FALSE;
-       }
-
-       init_func = lt_dlsym(mod->dl, "init");
-       if (!init_func || init_func(m) != 0) {
-               dl_print_errors(__func__);
-               lt_dlclose(mod->dl);
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
-static void module_unload(GTypeModule *m)
-{
-       UPkgModule *mod = UPKG_MODULE(m);
-
-       if (lt_dlclose(mod->dl) != 0) {
-               dl_print_errors(__func__);
-       }
-}
-
-static void upkg_module_init(UPkgModule *mod)
-{
-}
-
-static void upkg_module_class_init(UPkgModuleClass *class)
-{
-       GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
-
-       modclass->load   = module_load;
-       modclass->unload = module_unload;
-}
-
-static UPkgModule *uobject_module_new(const char *name)
-{
-       char *name2;
-
-       if (!name) {
-               return NULL;
-       }
-
-       name2 = malloc(strlen(name)+1);
-       if (!name2) {
-               return NULL;
-       }
-
-       UPkgModule *mod = g_object_new(UPKG_MODULE_TYPE, NULL);
-       if (!mod) {
-               free(name2);
-               return NULL;
-       }
-
-       G_TYPE_MODULE(mod)->name = str_cpy_lower(name2, name);
-       return mod;
-}
-
 static int modcmp(const void *a, const void *b, void *_data)
 {
        const GTypeModule *ma = a;
@@ -135,12 +59,6 @@ int uobject_module_init(void)
                        return -1;
                }
 
-               if (lt_dlinit() != 0) {
-                       avl_destroy(package_tree, NULL);
-                       dl_print_errors(__func__);
-                       return -1;
-               }
-
                g_type_init();
        }
 
@@ -153,10 +71,7 @@ int uobject_module_exit(void)
        if (--initialized)
                return 0;
 
-       if (lt_dlexit() != 0) {
-               dl_print_errors(__func__);
-               return -1;
-       }
+       avl_destroy(package_tree, NULL);
 
        return 0;
 }
@@ -170,7 +85,7 @@ GType uobject_module_get_class(const char *package, const char *class)
        if (!mod) {
                void **p;
 
-               mod = G_TYPE_MODULE(uobject_module_new(package));
+               mod = u_pkg_new(package);
                if (!mod) {
                        return 0;
                }