libupkg: Split the upkg_export struct into public/private parts.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 038eb39fe9ce410921abbad8134f5e180536fdb4..989bf798f322e10d5d546d8f1e99d63ee3385868 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -181,18 +181,18 @@ void print_guid(unsigned char guid[static 16])
 void print_upkg_exports(struct upkg *pkg)
 {
        for (unsigned i = 0; i < pkg->export_count; i++) {
-               const char *name, *package, *class;
+               const struct upkg_export *export = upkg_get_export(pkg, i);
+               const char *package, *class;
 
-               name  = upkg_export_name(pkg, i);
                class = upkg_export_class(pkg, i, &package);
 
-               if (!name || !class)
+               if (!class)
                        continue;
 
-               printf("%u - %s (%s.%s)\n", i+1, name, package, class);
-               printf("  Flags: %lx\n", upkg_export_flags(pkg, i));
+               printf("%u - %s (%s.%s)\n", i+1, export->name, package, class);
+               printf("  Flags: %lx\n", export->flags);
                if (verbose >= 2) {
-                       print_upkg_object_flags("    ", upkg_export_flags(pkg, i));
+                       print_upkg_object_flags("    ", export->flags);
                }
        }
 }
@@ -225,6 +225,7 @@ int package_info(struct upkg *pkg)
 
 static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 {
+       const struct upkg_export *export = upkg_get_export(pkg, idx);
        char name[256];
        FILE *of;
 
@@ -238,7 +239,7 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 
        u_object_export_name(obj, name, sizeof name);
 
-       printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name);
+       printf("exporting %s to %s\n", export->name, name);
        of = fopen(name, "wb");
        if (!of) {
                perror(name);