Adding upstream version 1.17~rc2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
73f740a795
commit
27b84c299b
12 changed files with 126 additions and 100 deletions
14
repair.cc
14
repair.cc
|
@ -77,7 +77,7 @@ int repair_file( const std::string & input_filename,
|
|||
if( verbosity >= 1 ) // damaged member found
|
||||
{
|
||||
std::printf( "Repairing member %ld of %ld (failure pos = %llu)\n",
|
||||
i + 1, (long)file_index.members(), mpos + failure_pos );
|
||||
i + 1, file_index.members(), mpos + failure_pos );
|
||||
std::fflush( stdout );
|
||||
}
|
||||
uint8_t * const mbuffer = read_member( infd, mpos, msize );
|
||||
|
@ -173,8 +173,8 @@ int debug_delay( const std::string & input_filename, Block range,
|
|||
const long long msize = file_index.mblock( i ).size();
|
||||
if( verbosity >= 1 ) // damaged member found
|
||||
{
|
||||
std::printf( "Finding max delay in member %ld of %ld (member pos = %llu)\n",
|
||||
i + 1, (long)file_index.members(), mpos );
|
||||
std::printf( "Finding max delay in member %ld of %ld (mpos = %llu, msize = %llu)\n",
|
||||
i + 1, file_index.members(), mpos, msize );
|
||||
std::fflush( stdout );
|
||||
}
|
||||
uint8_t * const mbuffer = read_member( infd, mpos, msize );
|
||||
|
@ -253,7 +253,7 @@ int debug_repair( const std::string & input_filename, const long long bad_pos,
|
|||
{
|
||||
if( verbosity >= 0 )
|
||||
std::printf( "Member %ld of %ld already damaged (failure pos = %llu)\n",
|
||||
idx + 1, (long)file_index.members(), mpos + failure_pos );
|
||||
idx + 1, file_index.members(), mpos + failure_pos );
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
@ -275,10 +275,10 @@ int debug_repair( const std::string & input_filename, const long long bad_pos,
|
|||
}
|
||||
if( verbosity >= 1 )
|
||||
{
|
||||
std::printf( "Test repairing member %ld of %ld\n"
|
||||
std::printf( "Test repairing member %ld of %ld (mpos = %llu, msize = %llu)\n"
|
||||
" (damage pos = %llu (0x%02X->0x%02X), failure pos = %llu)\n",
|
||||
idx + 1, (long)file_index.members(), mpos + bad_pos,
|
||||
good_value, bad_value, mpos + failure_pos );
|
||||
idx + 1, file_index.members(), mpos, msize,
|
||||
mpos + bad_pos, good_value, bad_value, mpos + failure_pos );
|
||||
std::fflush( stdout );
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue