mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-05 23:17:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

- Use an int32 for each checksum length variable.

Browse Source 
- Simplified some of the code, removing a useless memcpy().
This commit is contained in:
Wayne Davison
2005-01-01 21:08:05 +00:00
parent 3dfe6e97a7
commit deb5bf1dff
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
checksum.c
View File

@@ -30,9 +30,9 @@ extern int protocol_version;
a simple 32 bit checksum that can be upadted from either end
(inspired by Mark Adler's Adler-32 checksum)
*/
uint32 get_checksum1(char *buf1,int len)
uint32 get_checksum1(char *buf1, int32 len)
{
int i;
int32 i;
uint32 s1, s2;
schar *buf = (schar *)buf1;
@@ -49,18 +49,20 @@ uint32 get_checksum1(char *buf1,int len)
}
void get_checksum2(char *buf,int len,char *sum)
void get_checksum2(char *buf, int32 len, char *sum)
{
int i;
int32 i;
static char *buf1;
static int len1;
static int32 len1;
struct mdfour m;
if (len > len1) {
if (buf1) free(buf1);
if (buf1)
free(buf1);
buf1 = new_array(char, len+4);
len1 = len;
if (!buf1) out_of_memory("get_checksum2");
if (!buf1)
out_of_memory("get_checksum2");
}
mdfour_begin(&m);
@@ -125,7 +127,7 @@ void file_checksum(char *fname,char *sum,OFF_T size)
}
static int sumresidue;
static int32 sumresidue;
static char sumrbuf[CSUM_CHUNK];
static struct mdfour md;
@@ -146,41 +148,37 @@ void sum_init(int seed)
* @todo Perhaps get rid of md and just pass in the address each time.
* Very slightly clearer and slower.
**/
void sum_update(char *p, int len)
void sum_update(char *p, int32 len)
{
int i;
if (len + sumresidue < CSUM_CHUNK) {
memcpy(sumrbuf+sumresidue, p, len);
memcpy(sumrbuf + sumresidue, p, len);
sumresidue += len;
return;
}
if (sumresidue) {
i = MIN(CSUM_CHUNK-sumresidue,len);
memcpy(sumrbuf+sumresidue,p,i);
mdfour_update(&md, (uchar *)sumrbuf, (i+sumresidue));
int32 i = CSUM_CHUNK - sumresidue;
memcpy(sumrbuf + sumresidue, p, i);
mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
len -= i;
p += i;
}
for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
memcpy(sumrbuf,p+i,CSUM_CHUNK);
mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK);
while (len >= CSUM_CHUNK) {
mdfour_update(&md, (uchar *)p, CSUM_CHUNK);
len -= CSUM_CHUNK;
p += CSUM_CHUNK;
}
if (len - i > 0) {
sumresidue = len-i;
memcpy(sumrbuf,p+i,sumresidue);
} else {
sumresidue = 0;
}
sumresidue = len;
if (sumresidue)
memcpy(sumrbuf, p, sumresidue);
}
void sum_end(char *sum)
{
if (sumresidue || protocol_version >= 27) {
if (sumresidue || protocol_version >= 27)
mdfour_update(&md, (uchar *)sumrbuf, sumresidue);
}
mdfour_result(&md, (uchar *)sum);
}