Use standard format specifiers

diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c
index a6475308e016d3b67811bdb3c8f63a6d6b68d36e..43738b53744dae30a3ad61638c5e5624db09ff08 100644 (file)
--- a/libarchive/archive_read_support_format_cab.c
+++ b/libarchive/archive_read_support_format_cab.c
@@ -1172,7 +1172,7 @@ cab_checksum_finish(struct archive_read *a)
            cfdata->memimage + CFDATA_cbData, l, cfdata->sum_calculated);
        if (cfdata->sum_calculated != cfdata->sum) {
                archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
-                   "Checksum error CFDATA[%d] %x:%x in %d bytes",
+                   "Checksum error CFDATA[%d] %" PRIx32 ":%" PRIx32 " in %d bytes",
                    cab->entry_cffolder->cfdata_index -1,
                    cfdata->sum, cfdata->sum_calculated,
                    cfdata->compressed_size);

diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c
index 7a308a8d8a728b24159d2fe00135207c337c8f95..d06c5f939767babbac175b7d9571ef04a0a0e57b 100644 (file)
--- a/libarchive/archive_read_support_format_rar5.c
+++ b/libarchive/archive_read_support_format_rar5.c
@@ -3831,7 +3831,7 @@ static int verify_checksums(struct archive_read* a) {
 
                                DEBUG_CODE {
                                        printf("Checksum error: CRC32 "
-                                           "(was: %08x, expected: %08x)\n",
+                                           "(was: %08" PRIx32 ", expected: %08" PRIx32 ")\n",
                                            rar->file.calculated_crc32,
                                            rar->file.stored_crc32);
                                }
@@ -3845,7 +3845,7 @@ static int verify_checksums(struct archive_read* a) {
                        } else {
                                DEBUG_CODE {
                                        printf("Checksum OK: CRC32 "
-                                           "(%08x/%08x)\n",
+                                           "(%08" PRIx32 "/%08" PRIx32 ")\n",
                                            rar->file.stored_crc32,
                                            rar->file.calculated_crc32);
                                }

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 6581ca0acf6dee47b351942caf51256d1d03b0a2..24344b1db169e4ebe82aa04b7f36d0d5a9f29093 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -1901,15 +1901,15 @@ zipx_ppmd8_init(struct archive_read *a, struct zip *zip)
 
        if(order < 2 || restore_method > 2) {
                archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
-                   "Invalid parameter set in PPMd8 stream (order=%d, "
-                   "restore=%d)", order, restore_method);
+                   "Invalid parameter set in PPMd8 stream (order=%" PRId32 ", "
+                   "restore=%" PRId32 ")", order, restore_method);
                return (ARCHIVE_FAILED);
        }
 
        /* Allocate the memory needed to properly decompress the file. */
        if(!__archive_ppmd8_functions.Ppmd8_Alloc(&zip->ppmd8, mem << 20)) {
                archive_set_error(&a->archive, ENOMEM,
-                   "Unable to allocate memory for PPMd8 stream: %d bytes",
+                   "Unable to allocate memory for PPMd8 stream: %" PRId32 " bytes",
                    mem << 20);
                return (ARCHIVE_FATAL);
        }