upkg: Only print object properties if they are non-NULL.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 176eca9ca491adc39a62c4e62104e5ff1600a412..9213753bb354c9e25148cda27072e102a6b8da6a 100644 (file)
--- 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);
@@ -311,8 +311,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                        if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
                                UObject *obj = g_value_get_object(&val);
 
-                               /* TODO: Display full object names here. */
-                               if (obj->pkg_name) {
+                               if (obj && obj->pkg_name) {
                                        printf(" %s", obj->pkg_name);
                                }
                        }
@@ -391,11 +390,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 +417,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;
                }