X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4cac9f15932adee255ed2be1f6d419ffe068c438..3896f18892f87f3c354cb47965c4064d3ff26f5d:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 4e524ef..e1a8a80 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -157,15 +157,15 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 	char name[256];
 	FILE *of;
 
-	if (u_object_deserialize(obj, pkg, idx) != 0) {
+	if (uobject_deserialize(obj, pkg, idx) != 0) {
 		return -1;
 	}
 
-	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+	if (UOBJECT_IS_LOADABLE(obj) && uobject_load(obj) != 0) {
 		return -1;
 	}
 
-	u_object_export_name(obj, name, sizeof name);
+	uobject_export_name(obj, name, sizeof name);
 
 	printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name);
 	of = fopen(name, "wb");
@@ -174,15 +174,15 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 		return -1;
 	}
 
-	u_object_export(obj, of);
+	uobject_export(obj, of);
 
 	if (fclose(of) != 0) {
 		perror(name);
 		return -1;
 	}
 
-	if (U_OBJECT_IS_LOADABLE(obj)) {
-		u_object_unload(obj);
+	if (UOBJECT_IS_LOADABLE(obj)) {
+		uobject_unload(obj);
 	}
 
 	return 0;
@@ -202,11 +202,11 @@ int package_export(struct upkg *pkg)
 			return EXIT_FAILURE;
 		}
 
-		type = module_get_class(package, class);
+		type = uobject_module_get_class(package, class);
 		if (!type) continue;
 
 		obj = g_object_new(type, NULL);
-		if (U_OBJECT_IS_EXPORTABLE(obj)) {
+		if (UOBJECT_IS_EXPORTABLE(obj)) {
 			if (export(pkg, obj, i) != 0) {
 				rc = EXIT_FAILURE;
 			}
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	if (module_init() != 0)
+	if (uobject_module_init() != 0)
 		return EXIT_FAILURE;
 
 	pkg = upkg_fopen(argv[optind]);
@@ -272,6 +272,6 @@ int main(int argc, char **argv)
 	}
 
 	upkg_close(pkg);
-	module_exit();
+	uobject_module_exit();
 	return rc;
 }