X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/80314102fea3deac6a30827e65a55b8cce760446..0438ce1525f7c1e722140c046fccb0f686b4cab2:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 4a76fa2..a8c7c7e 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -25,10 +25,10 @@
 #include <glib-object.h>
 
 #include "upkg.h"
-#include "module.h"
-#include "uobject.h"
-#include "exportable.h"
-#include "loadable.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
+#include <uobject/loadable.h>
+#include <uobject/module.h>
 
 enum {
 	MODE_INFO,
@@ -154,17 +154,15 @@ int package_info(struct upkg *pkg)
 
 static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 {
-	struct upkg_file *f = upkg_export_open(pkg, idx);
 	char name[256];
 	FILE *of;
-	int rc = -1;
 
-	if (u_object_deserialize(obj, f) != 0) {
-		goto out;
+	if (u_object_deserialize(obj, pkg, idx) != 0) {
+		return -1;
 	}
 
 	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
-		goto out;
+		return -1;
 	}
 
 	u_object_export_name(obj, name, sizeof name);
@@ -173,24 +171,21 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 	of = fopen(name, "wb");
 	if (!of) {
 		perror(name);
-		goto out;
+		return -1;
 	}
 
-	rc = u_object_export(obj, of);
+	u_object_export(obj, of);
 
 	if (fclose(of) != 0) {
 		perror(name);
-		rc = -1;
-		goto out;
+		return -1;
 	}
 
 	if (U_OBJECT_IS_LOADABLE(obj)) {
 		u_object_unload(obj);
 	}
 
-out:
-	upkg_export_close(f);
-	return rc;
+	return 0;
 }
 
 int package_export(struct upkg *pkg)
@@ -207,7 +202,7 @@ int package_export(struct upkg *pkg)
 			return EXIT_FAILURE;
 		}
 
-		type = module_get_class(package, class);
+		type = u_object_module_get_class(package, class);
 		if (!type) continue;
 
 		obj = g_object_new(type, NULL);
@@ -258,7 +253,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	if (module_init() != 0)
+	if (u_object_module_init() != 0)
 		return EXIT_FAILURE;
 
 	pkg = upkg_fopen(argv[optind]);
@@ -277,6 +272,6 @@ int main(int argc, char **argv)
 	}
 
 	upkg_close(pkg);
-	module_exit();
+	u_object_module_exit();
 	return rc;
 }