upkg: Update verbosity behaviour for --info.

We now have four levels of verbosity:
  0 - Display only header information.
  1 - Also display information on individual exports.
  2 - Also display expanded flag information.
  3 - Also display information on individual names.

diff --git a/src/upkg.c b/src/upkg.c
index b3e27a33e719f5227ba13f4f5d861222ba177a28..2c268b4c5cdafb97fcc6894b5539f9fbcc1d6ef9 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -187,7 +187,9 @@ void print_upkg_exports(struct upkg *pkg)
 
                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, name, package, class);
                printf("  Flags: %lx\n", upkg_export_flags(pkg, i));

-               print_upkg_object_flags("    ", upkg_export_flags(pkg, i));
+               if (verbose >= 2) {
+                       print_upkg_object_flags("    ", upkg_export_flags(pkg, i));
+               }

        }
 }
 
        }
 }
 


@@ -199,16 +201,14 @@ int package_info(struct upkg *pkg)
        print_guid(pkg->guid);
 
        printf("Flags:   %lx\n", pkg->flags);
        print_guid(pkg->guid);
 
        printf("Flags:   %lx\n", pkg->flags);

-       if (verbose >= 1) {
+       if (verbose >= 2) {

                print_upkg_flags("        ", pkg->flags);
        }
 
                print_upkg_flags("        ", pkg->flags);
        }
 

-       if (verbose >= 1) {
-               printf("Names:   %lu\n", pkg->name_count);
-               if (verbose >= 2) {
-                       for (unsigned long i = 0; i < pkg->name_count; i++) {
-                               printf("\t%s\n", upkg_get_name(pkg, i));
-                       }
+       printf("Names:   %lu\n", pkg->name_count);
+       if (verbose >= 3) {
+               for (unsigned long i = 0; i < pkg->name_count; i++) {
+                       printf("\t%s\n", upkg_get_name(pkg, i));

                }
        }
 
                }
        }