Merging upstream version 1.2~pre2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f9513766bb
commit
efa0d5eefe
22 changed files with 804 additions and 87 deletions
6
zcmp.cc
6
zcmp.cc
|
@ -246,12 +246,12 @@ int cmp( const long long max_size, const int infd[2],
|
|||
}
|
||||
}
|
||||
|
||||
buffer0[rd[0]] = ~buffer1[rd[0]]; // sentinels for the block compare
|
||||
buffer1[rd[1]] = ~buffer0[rd[1]];
|
||||
const int min_rd = std::min( rd[0], rd[1] );
|
||||
buffer0[min_rd] = 0; // sentinels for the block compare
|
||||
buffer1[min_rd] = 1;
|
||||
|
||||
int first_diff = block_compare( buffer0, buffer1, &line_number );
|
||||
byte_number += first_diff;
|
||||
const int min_rd = std::min( rd[0], rd[1] );
|
||||
|
||||
if( first_diff < min_rd )
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue