uobject: More namespace cleanups.

[upkg.git] / src / module.c

diff --git a/src/module.c b/src/module.c
index bd22cfc0e0dd5fc9360f20d27b032f0d5606106b..88a7f81b00137b81a57ed2f7030673e32e7bb03f 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -1,3 +1,22 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 Nick Bowler
+ *
+ *  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
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -5,6 +24,7 @@
 #include <glib-object.h>
 #include <ltdl.h>
 
+#include <uobject/module.h>
 #include "module.h"
 #include "avl.h"
 
@@ -27,7 +47,7 @@ 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()) {
+       while ((err = lt_dlerror())) {
                if (prefix) fprintf(stderr, "%s: ", prefix);
                puts(err);
        }
@@ -40,7 +60,7 @@ static gboolean module_load(GTypeModule *m)
 
        mod->dl = lt_dlopenext(G_TYPE_MODULE(m)->name);
        if (!mod->dl) {
-               dl_print_errors(__func__);
+               dl_print_errors(G_TYPE_MODULE(m)->name);
                return FALSE;
        }
 
@@ -75,7 +95,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;
 
@@ -106,7 +126,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);
@@ -128,7 +148,7 @@ int module_init(void)
        return 0;
 }
 
-int module_exit(void)
+int uobject_module_exit(void)
 {
        if (--initialized)
                return 0;
@@ -141,7 +161,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) };
@@ -150,7 +170,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;
                }