From d323b189345af7ff63c37f7501b70d0674cb74a4 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 18 Sep 2009 09:46:42 -0400 Subject: [PATCH] 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. --- src/upkg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/upkg.c b/src/upkg.c index b3e27a3..2c268b4 100644 --- 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)); - 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); - if (verbose >= 1) { + if (verbose >= 2) { 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)); } } -- 2.43.0