File pbzip2-fix_printf_format.patch of Package pbzip2
--- BZ2StreamScanner.cpp.orig 2010-12-20 19:28:34.000000000 +0100
+++ BZ2StreamScanner.cpp 2010-12-20 19:33:54.000000000 +0100
@@ -488,16 +488,16 @@
void BZ2StreamScanner::printCurrentState()
{
- fprintf( stderr, "current=%d, search pos=%d, end pos=%d; s-c=%d"
- "; out buf size=%d; out buf capacity=%d; header found=%d; search status=%d",
+ fprintf( stderr, "current=%ld, search pos=%ld, end pos=%ld; s-c=%ld"
+ "; out buf size=%u; out buf capacity=%zu; header found=%d; search status=%d",
getInBuffCurrent() - getInBuffBegin(),
getInBuffSearchPtr() - getInBuffBegin(),
getInBuffEnd() - getInBuffBegin(),
getInBuffSearchPtr() - getInBuffCurrent(),
- (int)_outBuff.bufSize,
- (int)_outBuffCapacity,
- (int)isBz2HeaderFound(),
- (int)getSearchStatus() );
+ _outBuff.bufSize,
+ _outBuffCapacity,
+ isBz2HeaderFound(),
+ getSearchStatus() );
}
/**
--- pbzip2.cpp.orig 2010-12-20 19:25:32.000000000 +0100
+++ pbzip2.cpp 2010-12-20 19:31:28.000000000 +0100
@@ -898,8 +898,8 @@
// give warning to user if block is larger than 250 million bytes
if (fileData->bufSize > 250000000)
{
- fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%"PRIu64" bytes].\n",
- (unsigned long long) fileData->bufSize);
+ fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%ud bytes].\n",
+ fileData->bufSize);
fprintf(stderr, " If program aborts, use regular BZIP2 to decompress.\n");
}
}
@@ -1418,7 +1418,7 @@
if (QuietMode != 1)
{
- fprintf(stderr, " Output Size: %"PRIu64" bytes\n", (unsigned long long)CompressedSize);
+ fprintf(stderr, " Output Size: %zu bytes\n", CompressedSize);
}
#ifdef PBZIP_DEBUG
@@ -1657,7 +1657,7 @@
close(hOutfile);
if (QuietMode != 1)
{
- fprintf(stderr, " Output Size: %"PRIu64" bytes\n", (unsigned long long)CompressedSize);
+ fprintf(stderr, " Output Size: %zu bytes\n", CompressedSize);
}
syncSetProducerDone(1); // Not really needed for direct version
@@ -2357,7 +2357,7 @@
// unlikely to get here since more likely exception will be thrown
if (OutputBuffer.size() != size)
{
- fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%u! Aborting...\n", size);
+ fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%zu! Aborting...\n", size);
safe_mutex_unlock(OutMutex);
exit(1);
}
@@ -3198,7 +3198,7 @@
#endif
if (sizeof(OFF_T) <= 4)
{
- fprintf(stderr, "\npbzip2: *WARNING: off_t variable size only %u bits!\n", sizeof(OFF_T)*CHAR_BIT);
+ fprintf(stderr, "\npbzip2: *WARNING: off_t variable size only %zu bits!\n", sizeof(OFF_T)*CHAR_BIT);
if (decompress == 1)
fprintf(stderr, " You will only able to uncompress files smaller than 2GB in size.\n\n");
else
@@ -3547,7 +3547,7 @@
if (decompress == 1)
fprintf(stderr, " BWT Block Size: %c00k\n", BWTblockSizeChar);
if (strcmp(InFilename, "-") != 0)
- fprintf(stderr, " Input Size: %"PRIu64" bytes\n", (unsigned long long)InFileSize);
+ fprintf(stderr, " Input Size: %zu bytes\n", InFileSize);
}
if (decompress == 1)
@@ -3612,7 +3612,7 @@
}
if (QuietMode != 1)
{
- fprintf(stderr, " Output Size: %"PRIu64" bytes\n", (unsigned long long)sizeof(Bz2HeaderZero));
+ fprintf(stderr, " Output Size: %zu bytes\n", sizeof(Bz2HeaderZero));
fprintf(stderr, "-------------------------------------------\n");
}
// remove input file unless requested not to by user
@@ -3664,7 +3664,7 @@
ret = pthread_create(&fifo->consumers[i], &ChildThreadAttributes, consumer_decompress, fifo);
if (ret != 0)
{
- fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%u (code = %d) Aborting...\n", i, ret);
+ fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%zu (code = %d) Aborting...\n", i, ret);
return 1;
}
}
@@ -3726,7 +3726,7 @@
ret = pthread_create(&fifo->consumers[i], &ChildThreadAttributes, consumer, fifo);
if (ret != 0)
{
- fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%u (code = %d) Aborting...\n", i, ret);
+ fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%zu (code = %d) Aborting...\n", i, ret);
return 1;
}
}