Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a typo that Andrea Gelmini pointed out.
[rsync/rsync.git]
/
checksum.c
diff --git
a/checksum.c
b/checksum.c
index
10cb366
..
90d6ee3
100644
(file)
--- a/
checksum.c
+++ b/
checksum.c
@@
-3,11
+3,12
@@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-200
7
Wayne Davison
+ * Copyright (C) 2004-200
9
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,8
+16,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-24,8
+24,6
@@
extern int checksum_seed;
extern int protocol_version;
extern int checksum_seed;
extern int protocol_version;
-int csum_length = SHORT_SUM_LENGTH; /* initial value */
-
/*
a simple 32 bit checksum that can be upadted from either end
(inspired by Mark Adler's Adler-32 checksum)
/*
a simple 32 bit checksum that can be upadted from either end
(inspired by Mark Adler's Adler-32 checksum)
@@
-58,7
+56,7
@@
void get_checksum2(char *buf, int32 len, char *sum)
md5_begin(&m);
md5_update(&m, (uchar *)buf, len);
if (checksum_seed) {
md5_begin(&m);
md5_update(&m, (uchar *)buf, len);
if (checksum_seed) {
- SIVAL(seedbuf, 0, checksum_seed);
+ SIVAL
u
(seedbuf, 0, checksum_seed);
md5_update(&m, seedbuf, 4);
}
md5_result(&m, (uchar *)sum);
md5_update(&m, seedbuf, 4);
}
md5_result(&m, (uchar *)sum);
@@
-164,9
+162,9
@@
void sum_init(int seed)
else {
mdfour_begin(&md);
sumresidue = 0;
else {
mdfour_begin(&md);
sumresidue = 0;
+ SIVAL(s, 0, seed);
+ sum_update(s, 4);
}
}
- SIVAL(s, 0, seed);
- sum_update(s, 4);
}
/**
}
/**