X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/63c73995e982c084a1ec81304a17acdebd7cff1f..33c1796d255a720ad076160efd6859ca74d0792f:/src/module.c
diff --git a/src/module.c b/src/module.c
index eec80e7..d7db268 100644
--- a/src/module.c
+++ b/src/module.c
@@ -2,9 +2,9 @@
* upkg: tool for manipulating Unreal Tournament packages.
* Copyright (C) 2009 Nick Bowler
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see .
*/
#include
@@ -25,31 +24,9 @@
#include
#include
+#include
#include "avl.h"
-#define UPKG_MODULE_TYPE (upkg_module_get_type())
-#define UPKG_MODULE(obj) \
- G_TYPE_CHECK_INSTANCE_CAST(obj, UPKG_MODULE_TYPE, UPkgModule)
-#define UPKG_MODULE_CLASS(class) \
- G_TYPE_CHECK_CLASS_CAST(class, UPKG_MODULE_TYPE, UPkgModuleClass)
-#define IS_UPKG_MODULE(obj) \
- G_TYPE_CHECK_INSTANCE_TYPE(obj, UPKG_MODULE_TYPE)
-#define IS_UPKG_MODULE_CLASS(class) \
- G_TYPE_CHECK_CLASS_TYPE(class, UPKG_MODULE_TYPE, UPkgModuleClass)
-
-typedef struct UPkgModule UPkgModule;
-typedef struct UPkgModuleClass UPkgModuleClass;
-
-struct UPkgModule {
- GTypeModule parent;
-
- lt_dlhandle dl;
-};
-
-struct UPkgModuleClass {
- GTypeModuleClass parent;
-};
-
static unsigned initialized;
static struct avl_table *package_tree;
@@ -64,82 +41,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;
@@ -148,7 +49,7 @@ static int modcmp(const void *a, const void *b, void *_data)
return strcmp(ma->name, mb->name);
}
-int uobject_module_init(void)
+int u_object_module_init(void)
{
if (!initialized) {
package_tree = avl_create(modcmp, NULL, NULL);
@@ -157,12 +58,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();
}
@@ -170,20 +65,17 @@ int uobject_module_init(void)
return 0;
}
-int uobject_module_exit(void)
+int u_object_module_exit(void)
{
if (--initialized)
return 0;
- if (lt_dlexit() != 0) {
- dl_print_errors(__func__);
- return -1;
- }
+ avl_destroy(package_tree, NULL);
return 0;
}
-GType uobject_module_get_class(const char *package, const char *class)
+GType u_object_module_get_class(const char *package, const char *class)
{
char buf[strlen(package) + strlen(class) + 1];
GTypeModule search = { .name = str_cpy_lower(buf, package) };
@@ -192,7 +84,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;
}