diff --git a/lrzip.c b/lrzip.c index 6bd2be5..03a7962 100644 --- a/lrzip.c +++ b/lrzip.c @@ -1072,7 +1072,7 @@ bool get_fileinfo(rzip_control *control) print_verbose("Chunk byte width: %d\n", chunk_byte); if (chunk_size) { chunk_total += chunk_size; - print_verbose("Chunk size: %'"PRId64"\n", chunk_size); + print_verbose("Chunk size: %"PRId64"\n", chunk_size); } if (unlikely(chunk_byte && (chunk_byte > 8 || chunk_size < 0))) failure("Invalid chunk data\n"); @@ -1086,7 +1086,7 @@ bool get_fileinfo(rzip_control *control) return false; print_verbose("Stream: %d\n", stream); - print_maxverbose("Offset: %'"PRId64"\n", stream_head[stream] + ofs); + print_maxverbose("Offset: %"PRId64"\n", stream_head[stream] + ofs); print_verbose("%s\t%s\t%s\t%16s / %14s", "Block","Comp","Percent","Comp Size", "UComp Size"); print_maxverbose("%18s : %14s", "Offset", "Head"); print_verbose("\n"); @@ -1127,8 +1127,8 @@ bool get_fileinfo(rzip_control *control) * the future */ utotal += u_len; ctotal += c_len; - print_verbose("\t%5.1f%%\t%'16"PRId64" / %'14"PRId64"", percentage(c_len, u_len), c_len, u_len); - print_maxverbose("%'18"PRId64" : %'14"PRId64"", head_off, last_head); + print_verbose("\t%5.1f%%\t%16"PRId64" / %14"PRId64"", percentage(c_len, u_len), c_len, u_len); + print_maxverbose("%18"PRId64" : %14"PRId64"", head_off, last_head); print_verbose("\n"); block++; } while (last_head); @@ -1165,7 +1165,7 @@ bool get_fileinfo(rzip_control *control) if (unlikely(ofs > infile_size)) failure_goto(("Offset greater than archive size, likely corrupted/truncated archive.\n"), error); print_output("\nSummary\n=======\n"); - print_output("File: %s\nlrzip version: %'d.%'d \n\n", infilecopy, + print_output("File: %s\nlrzip version: %d.%d \n\n", infilecopy, control->major_version, control->minor_version); if (!expected_size) @@ -1173,18 +1173,18 @@ bool get_fileinfo(rzip_control *control) print_verbose(" Stats Percent Compressed / Uncompressed\n -------------------------------------------------------\n"); /* If we can't show expected size, tailor output for it */ if (expected_size) { - print_verbose(" Rzip: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n", + print_verbose(" Rzip: %5.1f%%\t%16"PRId64" / %14"PRId64"\n", percentage (utotal, expected_size), utotal, expected_size); - print_verbose(" Back end: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n", + print_verbose(" Back end: %5.1f%%\t%16"PRId64" / %14"PRId64"\n", percentage(ctotal, utotal), ctotal, utotal); - print_verbose(" Overall: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n", + print_verbose(" Overall: %5.1f%%\t%16"PRId64" / %14"PRId64"\n", percentage(ctotal, expected_size), ctotal, expected_size); } else { print_verbose(" Rzip: Unavailable\n"); - print_verbose(" Back end: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n", percentage(ctotal, utotal), ctotal, utotal); + print_verbose(" Back end: %5.1f%%\t%16"PRId64" / %14"PRId64"\n", percentage(ctotal, utotal), ctotal, utotal); print_verbose(" Overall: Unavailable\n"); } print_verbose("\n"); @@ -1209,12 +1209,12 @@ bool get_fileinfo(rzip_control *control) print_output("\n"); if (expected_size) { - print_output(" Decompressed file size: %'14"PRIu64"\n", expected_size); - print_output(" Compressed file size: %'14"PRIu64"\n", infile_size); + print_output(" Decompressed file size: %14"PRIu64"\n", expected_size); + print_output(" Compressed file size: %14"PRIu64"\n", infile_size); print_output(" Compression ratio: %14.3Lfx\n", cratio); } else { print_output(" Decompressed file size: Unavailable\n"); - print_output(" Compressed file size: %'14"PRIu64"\n", infile_size); + print_output(" Compressed file size: %14"PRIu64"\n", infile_size); print_output(" Compression ratio: Unavailable\n"); } if (HAS_MD5) { diff --git a/main.c b/main.c index 9d2621c..eb0985f 100644 --- a/main.c +++ b/main.c @@ -57,7 +57,6 @@ #include "lrzip_core.h" #include "util.h" #include "stream.h" -#include /* needed for CRC routines */ #include "lzma/C/7zCrc.h" @@ -320,8 +319,6 @@ int main(int argc, char *argv[]) char *eptr, *av; /* for environment */ char *endptr = NULL; - setlocale(LC_ALL, ""); /* for printf features */ - control = &base_control; initialise_control(control);