diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2008-01-06 19:45:27 +0200 |
---|---|---|
committer | Lasse Collin <lasse.collin@tukaani.org> | 2008-01-06 19:45:27 +0200 |
commit | c15a7abf66e3a70792f7444115e484c7981c8284 (patch) | |
tree | 626fcdf95a36ba8feda61d0ef0f16abe4062110f | |
parent | Introduced compatibility with systems that have pre-C99 (diff) | |
download | xz-c15a7abf66e3a70792f7444115e484c7981c8284.tar.xz |
With printf(), use PRIu64 with a cast to uint64_t instead
of %zu, because some pre-C99 libc versions don't support %zu.
-rw-r--r-- | src/lzma/help.c | 13 | ||||
-rw-r--r-- | src/lzmadec/lzmadec.c | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/lzma/help.c b/src/lzma/help.c index ad7dd861..f2a30ff6 100644 --- a/src/lzma/help.c +++ b/src/lzma/help.c @@ -140,13 +140,14 @@ These aren't implemented yet. if (mem_limit == 0) mem_limit = 1; + // We use PRIu64 instead of %zu to support pre-C99 libc. puts(_("On this system and configuration, the tool will use")); - printf(_(" * roughly %zu MiB of memory at maximum; and\n"), - mem_limit); - printf(N_( - " * at maximum of one thread for (de)compression.\n\n", - " * at maximum of %zu threads for (de)compression.\n\n", - opt_threads), opt_threads); + printf(_(" * roughly %" PRIu64 " MiB of memory at maximum; and\n"), + (uint64_t)(mem_limit)); + printf(N_(" * at maximum of one thread for (de)compression.\n\n", + " * at maximum of %" PRIu64 + " threads for (de)compression.\n\n", + (uint64_t)(opt_threads)), (uint64_t)(opt_threads)); printf(_("Report bugs to <%s> (in English or Finnish).\n"), PACKAGE_BUGREPORT); diff --git a/src/lzmadec/lzmadec.c b/src/lzmadec/lzmadec.c index 93eed090..fef49249 100644 --- a/src/lzmadec/lzmadec.c +++ b/src/lzmadec/lzmadec.c @@ -108,10 +108,12 @@ help(void) "\n" "With no FILE, or when FILE is -, read standard input.\n" "\n" -"On this configuration, the tool will use about %zu MiB of memory at maximum.\n" +"On this configuration, the tool will use about %" PRIu64 + " MiB of memory at maximum.\n" "\n" "Report bugs to <" PACKAGE_BUGREPORT "> (in English or Finnish).\n", - argv0, (mem_limit + 512 * 1024) / (1024 * 1024)); + argv0, (uint64_t)((mem_limit + 512 * 1024) / (1024 * 1024))); + // Using PRIu64 above instead of %zu to support pre-C99 libc. exit(0); } |