projects
/
redis.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
736b7c3
)
dump/restore fixed to use the new crc64 API.
author
antirez
<antirez@gmail.com>
Mon, 9 Apr 2012 10:33:57 +0000
(12:33 +0200)
committer
antirez
<antirez@gmail.com>
Mon, 9 Apr 2012 10:33:57 +0000
(12:33 +0200)
src/cluster.c
patch
|
blob
|
blame
|
history
diff --git
a/src/cluster.c
b/src/cluster.c
index 8cd20c84d740c9e1686d5b71f2ab2be55f8fb70d..50c25c35b103b428c8fd26d48e513617d9d5e3c2 100644
(file)
--- a/
src/cluster.c
+++ b/
src/cluster.c
@@
-1486,7
+1486,7
@@
void createDumpPayload(rio *payload, robj *o) {
payload->io.buffer.ptr = sdscatlen(payload->io.buffer.ptr,buf,2);
/* CRC64 */
payload->io.buffer.ptr = sdscatlen(payload->io.buffer.ptr,buf,2);
/* CRC64 */
- crc = crc64((unsigned char*)payload->io.buffer.ptr,
+ crc = crc64(
0,
(unsigned char*)payload->io.buffer.ptr,
sdslen(payload->io.buffer.ptr));
memrev64ifbe(&crc);
payload->io.buffer.ptr = sdscatlen(payload->io.buffer.ptr,&crc,8);
sdslen(payload->io.buffer.ptr));
memrev64ifbe(&crc);
payload->io.buffer.ptr = sdscatlen(payload->io.buffer.ptr,&crc,8);
@@
-1510,7
+1510,7
@@
int verifyDumpPayload(unsigned char *p, size_t len) {
if (rdbver != REDIS_RDB_VERSION) return REDIS_ERR;
/* Verify CRC64 */
if (rdbver != REDIS_RDB_VERSION) return REDIS_ERR;
/* Verify CRC64 */
- crc = crc64(p,len-8);
+ crc = crc64(
0,
p,len-8);
memrev64ifbe(&crc);
return (memcmp(&crc,footer+2,8) == 0) ? REDIS_OK : REDIS_ERR;
}
memrev64ifbe(&crc);
return (memcmp(&crc,footer+2,8) == 0) ? REDIS_OK : REDIS_ERR;
}