X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/8afa7b7717a5a2f45182a63d043401960fdeef92..76b8a4bf05701afcd1be69ff4490a7c6be431dc4:/src/upkg.c diff --git a/src/upkg.c b/src/upkg.c index 176eca9..202876a 100644 --- a/src/upkg.c +++ b/src/upkg.c @@ -290,7 +290,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx) GObject *obj; unsigned n; - obj = u_object_new_from_package(upkg, idx); + obj = u_object_new_from_package(pkg, idx); if (!obj) { fprintf(stderr, "%s: failed to load object.\n", progname); @@ -391,11 +391,10 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx) static int object_export(GTypeModule *pkg, unsigned long idx) { - struct upkg *upkg = U_PKG(pkg)->pkg; GObject *obj; int ret = -1; - obj = u_object_new_from_package(upkg, idx); + obj = u_object_new_from_package(pkg, idx); if (!obj) { fprintf(stderr, "%s: failed to load object.\n", progname); return -1; @@ -419,7 +418,7 @@ int package_export(GTypeModule *pkg) int ret = 0; for (unsigned i = 0; i < upkg->export_count; i++) { - obj = u_object_new_from_package(upkg, i); + obj = u_object_new_from_package(pkg, i); if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) { ret = -1; }