upkg: In info mode, don't fail outright if object load fails.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index d44422cd5ee92aa8db5fc2c9a2dfc6ff1d09a288..ee1023a28cc3c33a80f0af410130b12976822816 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -294,78 +294,89 @@ static int package_list(GTypeModule *pkg, long current)
        return 0;
 }
 
-static int object_info(GTypeModule *pkg, unsigned long idx)
+static int object_dump_properties(GTypeModule *pkg, unsigned long idx)
 {
-       struct upkg *upkg = U_PKG(pkg)->pkg;
-       const struct upkg_export *export;
-       const char *class, *package;
-
-       export = upkg_get_export(upkg, idx);
-       export_print_fullname(pkg, export);
-
-       class = upkg_export_class(upkg, idx, &package);
-       printf(" (%s.%s)\n", package, class);
+       GParamSpec **props;
+       GObject *obj;
+       unsigned n;
 
-       /* Print out object properties. */
-       if (verbose >= 1) {
-               GParamSpec **props;
-               GObject *obj;
-               unsigned n;
-
-               obj = u_object_new_from_package(pkg, idx);
-               if (!obj) {
-                       fprintf(stderr, "%s: failed to load object.\n",
-                                       progname);
-                       return -1;
-               }
+       obj = u_object_new_from_package(pkg, idx);
+       if (!obj) {
+               fprintf(stderr, "%s: failed to load object.\n", progname);
+               return -1;
+       }
 
-               props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
-               for (unsigned i = 0; i < n; i++) {
-                       GValue val = {0};
-                       char *valstr;
+       props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
+       for (unsigned i = 0; i < n; i++) {
+               GValue val = {0};
+               char *valstr;
 
-                       printf("  property %s:", props[i]->name);
-                       fflush(stdout);
+               printf("  property %s:", props[i]->name);
+               fflush(stdout);
 
-                       g_value_init(&val, props[i]->value_type);
-                       g_object_get_property(obj, props[i]->name, &val);
+               g_value_init(&val, props[i]->value_type);
+               g_object_get_property(obj, props[i]->name, &val);
 
-                       if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
-                               UObject *obj = g_value_get_object(&val);
+               if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
+                       UObject *obj = g_value_get_object(&val);
 
-                               if (obj && obj->pkg_name) {
-                                       printf(" %s", obj->pkg_name);
-                               }
+                       if (obj && obj->pkg_name) {
+                               printf(" %s", obj->pkg_name);
                        }
-
-                       valstr = g_strdup_value_contents(&val);
-                       printf(" %s\n", valstr);
-                       g_free(valstr);
                }
-               free(props);
 
-               g_object_unref(obj);
+               valstr = g_strdup_value_contents(&val);
+               printf(" %s\n", valstr);
+               g_free(valstr);
        }
 
-       /* Print raw file info. */
-       if (verbose >= 3) {
-               struct upkg_file *f = upkg_export_open(upkg, idx);
-               if (!f) {
-                       fprintf(stderr, "%s: failed to open export.\n",
-                                       progname);
-                       return -1;
-               }
+       g_free(props);
+       g_object_unref(obj);
 
-               printf("  file size: %lu\n", f->len);
-               printf("  file start: %#lx\n", f->base);
-               printf("  file end: %#lx\n", f->base + f->len);
+       return 0;
+}
 
-               upkg_export_close(f);
+static int object_dump_offsets(GTypeModule *pkg, unsigned long idx)
+{
+       struct upkg_file *f;
+
+       f = upkg_export_open(U_PKG(pkg)->pkg, idx);
+       if (!f) {
+               fprintf(stderr, "%s: failed to open export.\n", progname);
+               return -1;
        }
 
+       printf("  file size: %lu\n", f->len);
+       printf("  file start: %#lx\n", f->base);
+       printf("  file end: %#lx\n", f->base + f->len);
+
+       upkg_export_close(f);
+
        return 0;
 }
 
+static int object_info(GTypeModule *pkg, unsigned long idx)
+{
+       struct upkg *upkg = U_PKG(pkg)->pkg;
+       const struct upkg_export *export;
+       const char *class, *package;
+       int ret = 0;
+
+       export = upkg_get_export(upkg, idx);
+       export_print_fullname(pkg, export);
+
+       class = upkg_export_class(upkg, idx, &package);
+       printf(" (%s.%s)\n", package, class);
+
+       if (verbose >= 1 && object_dump_properties(pkg, idx) != 0)
+               ret = -1;
+
+       if (verbose >= 3 && object_dump_offsets(pkg, idx))
+               ret = -1;
+
+       return ret;
+}
+
 static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 {
        struct upkg *upkg = U_PKG(pkg)->pkg;