]>
Commit | Line | Data |
---|---|---|
9c5441f9 PG |
1 | diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7dev/mdfour.h |
2 | --- librsync-0.9.7/mdfour.h 2004-02-07 18:17:57.000000000 -0500 | |
3 | +++ librsync-0.9.7dev/mdfour.h 2006-03-06 03:21:46.000000000 -0500 | |
4 | @@ -24,7 +24,7 @@ | |
5 | #include "types.h" | |
6 | ||
7 | struct rs_mdfour { | |
8 | - int A, B, C, D; | |
9 | + unsigned int A, B, C, D; | |
10 | #if HAVE_UINT64 | |
11 | uint64_t totalN; | |
12 | #else | |
13 | diff -urN librsync-0.9.7/patch.c librsync-0.9.7dev/patch.c | |
14 | --- librsync-0.9.7/patch.c 2004-09-17 17:35:50.000000000 -0400 | |
15 | +++ librsync-0.9.7dev/patch.c 2006-03-06 03:21:06.000000000 -0500 | |
16 | @@ -214,12 +214,12 @@ | |
17 | void *buf, *ptr; | |
18 | rs_buffers_t *buffs = job->stream; | |
19 | ||
20 | - len = job->basis_len; | |
21 | - | |
22 | /* copy only as much as will fit in the output buffer, so that we | |
23 | * don't have to block or store the input. */ | |
24 | - if (len > buffs->avail_out) | |
25 | + if (job->basis_len > buffs->avail_out) | |
26 | len = buffs->avail_out; | |
27 | + else | |
28 | + len = job->basis_len; | |
29 | ||
30 | if (!len) | |
31 | return RS_BLOCKED; |