| 1 |
commit: 466b34112637d2f777a8d9873ec05f49cc3cb415 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 22 18:06:04 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 22 18:06:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=466b3411 |
| 7 |
|
| 8 |
qsize: clean up printf formats |
| 9 |
|
| 10 |
Use proper size flags like %zu for size_t instead of casting everything |
| 11 |
to an unsigned long. |
| 12 |
|
| 13 |
qsize.c | 26 ++++++++++++-------------- |
| 14 |
1 file changed, 12 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/qsize.c b/qsize.c |
| 17 |
index 7a40141..b9f3afb 100644 |
| 18 |
--- a/qsize.c |
| 19 |
+++ b/qsize.c |
| 20 |
@@ -152,21 +152,20 @@ int qsize_main(int argc, char **argv) |
| 21 |
num_all_ignored += num_ignored; |
| 22 |
|
| 23 |
if (!summary_only) { |
| 24 |
- printf("%s%s/%s%s%s: %'lu files, %'lu non-files, ", BOLD, |
| 25 |
+ printf("%s%s/%s%s%s: %'zu files, %'zu non-files, ", BOLD, |
| 26 |
catname, BLUE, pkgname, NORM, |
| 27 |
- (unsigned long)num_files, |
| 28 |
- (unsigned long)num_nonfiles); |
| 29 |
+ num_files, num_nonfiles); |
| 30 |
if (num_ignored) |
| 31 |
- printf("%'lu names-ignored, ", (unsigned long)num_ignored); |
| 32 |
+ printf("%'zu names-ignored, ", num_ignored); |
| 33 |
if (disp_units) |
| 34 |
printf("%s %s\n", |
| 35 |
make_human_readable_str(num_bytes, 1, disp_units), |
| 36 |
str_disp_units); |
| 37 |
else |
| 38 |
- printf("%'lu%s%lu KiB\n", |
| 39 |
- (unsigned long)(num_bytes / KILOBYTE), |
| 40 |
+ printf("%'"PRIu64"%s%"PRIu64" KiB\n", |
| 41 |
+ num_bytes / KILOBYTE, |
| 42 |
decimal_point, |
| 43 |
- (unsigned long)(((num_bytes%KILOBYTE)*1000)/KILOBYTE)); |
| 44 |
+ ((num_bytes % KILOBYTE) * 1000) / KILOBYTE); |
| 45 |
} |
| 46 |
|
| 47 |
next_pkg: |
| 48 |
@@ -175,20 +174,19 @@ int qsize_main(int argc, char **argv) |
| 49 |
} |
| 50 |
|
| 51 |
if (summary) { |
| 52 |
- printf(" %sTotals%s: %'lu files, %'lu non-files, ", BOLD, NORM, |
| 53 |
- (unsigned long)num_all_files, |
| 54 |
- (unsigned long)num_all_nonfiles); |
| 55 |
+ printf(" %sTotals%s: %'zu files, %'zu non-files, ", BOLD, NORM, |
| 56 |
+ num_all_files, num_all_nonfiles); |
| 57 |
if (num_all_ignored) |
| 58 |
- printf("%'lu names-ignored, ", (unsigned long)num_all_ignored); |
| 59 |
+ printf("%'zu names-ignored, ", num_all_ignored); |
| 60 |
if (disp_units) |
| 61 |
printf("%s %s\n", |
| 62 |
make_human_readable_str(num_all_bytes, 1, disp_units), |
| 63 |
str_disp_units); |
| 64 |
else |
| 65 |
- printf("%'lu%s%lu MiB\n", |
| 66 |
- (unsigned long)(num_all_bytes / MEGABYTE), |
| 67 |
+ printf("%'"PRIu64"%s%"PRIu64" MiB\n", |
| 68 |
+ num_all_bytes / MEGABYTE, |
| 69 |
decimal_point, |
| 70 |
- (unsigned long)(((num_all_bytes%MEGABYTE)*1000)/MEGABYTE)); |
| 71 |
+ ((num_all_bytes % MEGABYTE) * 1000) / MEGABYTE); |
| 72 |
} |
| 73 |
array_for_each(atoms, i, atom) |
| 74 |
atom_implode(atom); |
Archives