X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4cac9f15932adee255ed2be1f6d419ffe068c438..03eb9c441bba9f41d36cfd8f2cf1d43a5ee42252:/src/module.c

diff --git a/src/module.c b/src/module.c
index b1067db..eec80e7 100644
--- a/src/module.c
+++ b/src/module.c
@@ -27,6 +27,29 @@
 #include <uobject/module.h>
 #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;
 
@@ -94,7 +117,7 @@ static void upkg_module_class_init(UPkgModuleClass *class)
 	modclass->unload = module_unload;
 }
 
-UPkgModule *upkg_module_new(const char *name)
+static UPkgModule *uobject_module_new(const char *name)
 {
 	char *name2;
 
@@ -125,7 +148,7 @@ static int modcmp(const void *a, const void *b, void *_data)
 	return strcmp(ma->name, mb->name);
 }
 
-int module_init(void)
+int uobject_module_init(void)
 {
 	if (!initialized) {
 		package_tree = avl_create(modcmp, NULL, NULL);
@@ -147,7 +170,7 @@ int module_init(void)
 	return 0;
 }
 
-int module_exit(void)
+int uobject_module_exit(void)
 {
 	if (--initialized)
 		return 0;
@@ -160,7 +183,7 @@ int module_exit(void)
 	return 0;
 }
 
-GType module_get_class(const char *package, const char *class)
+GType uobject_module_get_class(const char *package, const char *class)
 {
 	char buf[strlen(package) + strlen(class) + 1];
 	GTypeModule search = { .name = str_cpy_lower(buf, package) };
@@ -169,7 +192,7 @@ GType module_get_class(const char *package, const char *class)
 	if (!mod) {
 		void **p;
 
-		mod = G_TYPE_MODULE(upkg_module_new(package));
+		mod = G_TYPE_MODULE(uobject_module_new(package));
 		if (!mod) {
 			return 0;
 		}