X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/40a37fe8b53386add565d0e9a631928869d059a2..82202f3afe5b662d6896e91903e491630c1ec7dd:/src/module.c

diff --git a/src/module.c b/src/module.c
index 025d600..bdf0c8b 100644
--- 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>
@@ -27,7 +46,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 +59,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;
 	}
 
@@ -100,8 +119,8 @@ UPkgModule *upkg_module_new(const char *name)
 
 static int modcmp(const void *a, const void *b, void *_data)
 {
-	GTypeModule *ma = G_TYPE_MODULE(a);
-	GTypeModule *mb = G_TYPE_MODULE(b);
+	const GTypeModule *ma = a;
+	const GTypeModule *mb = b;
 
 	return strcmp(ma->name, mb->name);
 }
@@ -109,7 +128,7 @@ static int modcmp(const void *a, const void *b, void *_data)
 int module_init(void)
 {
 	if (!initialized) {
-		package_tree = avl_create(modcmp, 0, &avl_allocator_default);
+		package_tree = avl_create(modcmp, NULL, NULL);
 		if (!package_tree) {
 			fprintf(stderr, "%s: failed to create package tree.\n", __func__);
 			return -1;
@@ -137,6 +156,8 @@ int module_exit(void)
 		dl_print_errors(__func__);
 		return -1;
 	}
+
+	return 0;
 }
 
 GType module_get_class(const char *package, const char *class)