X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/dc739f280f430ad323594ab38adf1e85b5ac0efd..d42028c588b512b26c3c4fea718cffcab602b74c:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 94ace92..b3e27a3 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -28,6 +28,7 @@
 #include <uobject/exportable.h>
 #include <uobject/loadable.h>
 #include <uobject/module.h>
+#include <uobject/package.h>
 
 enum {
 	MODE_INFO,
@@ -285,7 +286,7 @@ int package_export(struct upkg *pkg)
 
 int main(int argc, char **argv)
 {
-	struct upkg *pkg;
+	UPkg *upkg;
 	unsigned mode = MODE_INFO;
 	int opt, rc = EXIT_FAILURE;
 
@@ -322,22 +323,22 @@ int main(int argc, char **argv)
 	if (u_object_module_init() != 0)
 		return EXIT_FAILURE;
 
-	pkg = upkg_fopen(argv[optind]);
-	if (!pkg) {
+	upkg = U_PKG(u_pkg_new_by_file(argv[optind]));
+	if (!upkg) {
 		fprintf(stderr, "failed to open package!\n");
 		return EXIT_FAILURE;
 	}
 
 	switch (mode) {
 	case MODE_INFO:
-		rc = package_info(pkg);
+		rc = package_info(upkg->pkg);
 		break;
 	case MODE_EXPORT:
-		rc = package_export(pkg);
+		rc = package_export(upkg->pkg);
 		break;
 	}
 
-	upkg_close(pkg);
+	g_object_unref(upkg);
 	u_object_module_exit();
 	return rc;
 }