1*4882a593SmuzhiyunFrom de4a948d356c9befb88c796168e97eb05b9a3385 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 23 Apr 2018 22:54:42 -0700 4*4882a593SmuzhiyunSubject: [PATCH] pbzip2: Fix invalid suffix on literal C++11 warning 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFixes -Wreserved-user-defined-literal] errors. 7*4882a593SmuzhiyunAlso reported in launchpad here https://bugs.launchpad.net/pbzip2/+bug/1746369 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Submitted [https://launchpadlibrarian.net/355230152/pbzip2.patch] 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun pbzip2.cpp | 12 ++++++------ 14*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 6 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/pbzip2.cpp b/pbzip2.cpp 17*4882a593Smuzhiyunindex 66ca978..4287ea7 100644 18*4882a593Smuzhiyun--- a/pbzip2.cpp 19*4882a593Smuzhiyun+++ b/pbzip2.cpp 20*4882a593Smuzhiyun@@ -1220,7 +1220,7 @@ int producer_decompress(int hInfile, OFF_T fileSize, queue *fifo) 21*4882a593Smuzhiyun // give warning to user if block is larger than 250 million bytes 22*4882a593Smuzhiyun if (fileData->bufSize > 250000000) 23*4882a593Smuzhiyun { 24*4882a593Smuzhiyun- fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%"PRIuMAX" bytes].\n", 25*4882a593Smuzhiyun+ fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%" PRIuMAX " bytes].\n", 26*4882a593Smuzhiyun (uintmax_t) fileData->bufSize); 27*4882a593Smuzhiyun fprintf(stderr, " If program aborts, use regular BZIP2 to decompress.\n"); 28*4882a593Smuzhiyun } 29*4882a593Smuzhiyun@@ -1829,7 +1829,7 @@ void *fileWriter(void *outname) 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun if (QuietMode != 1) 32*4882a593Smuzhiyun { 33*4882a593Smuzhiyun- fprintf(stderr, " Output Size: %"PRIuMAX" bytes\n", (uintmax_t)CompressedSize); 34*4882a593Smuzhiyun+ fprintf(stderr, " Output Size: %" PRIuMAX " bytes\n", (uintmax_t)CompressedSize); 35*4882a593Smuzhiyun } 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun #ifdef PBZIP_DEBUG 38*4882a593Smuzhiyun@@ -2072,7 +2072,7 @@ int directcompress(int hInfile, OFF_T fileSize, int blockSize, const char *OutFi 39*4882a593Smuzhiyun close(hOutfile); 40*4882a593Smuzhiyun if (QuietMode != 1) 41*4882a593Smuzhiyun { 42*4882a593Smuzhiyun- fprintf(stderr, " Output Size: %"PRIuMAX" bytes\n", (uintmax_t)CompressedSize); 43*4882a593Smuzhiyun+ fprintf(stderr, " Output Size: %" PRIuMAX " bytes\n", (uintmax_t)CompressedSize); 44*4882a593Smuzhiyun } 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun syncSetProducerDone(1); // Not really needed for direct version 47*4882a593Smuzhiyun@@ -2794,7 +2794,7 @@ void outputBufferInit(size_t size) 48*4882a593Smuzhiyun // unlikely to get here since more likely exception will be thrown 49*4882a593Smuzhiyun if (OutputBuffer.size() != size) 50*4882a593Smuzhiyun { 51*4882a593Smuzhiyun- fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%"PRIuMAX"! Aborting...\n", (uintmax_t)size); 52*4882a593Smuzhiyun+ fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%" PRIuMAX "! Aborting...\n", (uintmax_t)size); 53*4882a593Smuzhiyun safe_mutex_unlock(OutMutex); 54*4882a593Smuzhiyun exit(1); 55*4882a593Smuzhiyun } 56*4882a593Smuzhiyun@@ -4102,7 +4102,7 @@ int main(int argc, char* argv[]) 57*4882a593Smuzhiyun if (decompress == 1) 58*4882a593Smuzhiyun fprintf(stderr, " BWT Block Size: %c00k\n", BWTblockSizeChar); 59*4882a593Smuzhiyun if (hasInFile) 60*4882a593Smuzhiyun- fprintf(stderr, " Input Size: %"PRIuMAX" bytes\n", (uintmax_t)InFileSize); 61*4882a593Smuzhiyun+ fprintf(stderr, " Input Size: %" PRIuMAX " bytes\n", (uintmax_t)InFileSize); 62*4882a593Smuzhiyun } 63*4882a593Smuzhiyun 64*4882a593Smuzhiyun if (decompress == 1) 65*4882a593Smuzhiyun@@ -4224,7 +4224,7 @@ int main(int argc, char* argv[]) 66*4882a593Smuzhiyun { 67*4882a593Smuzhiyun NumBufferedBlocksMax = numCPU; 68*4882a593Smuzhiyun if (QuietMode != 1) 69*4882a593Smuzhiyun- fprintf(stderr, "*Warning* Max memory limit increased to %"PRIuMAX" MB to support %d CPUs\n", (uintmax_t)((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU); 70*4882a593Smuzhiyun+ fprintf(stderr, "*Warning* Max memory limit increased to %" PRIuMAX " MB to support %d CPUs\n", (uintmax_t)((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU); 71*4882a593Smuzhiyun } 72*4882a593Smuzhiyun else 73*4882a593Smuzhiyun { 74