changeset 9538:c24a31b423ed HEAD

crc32*() didn't return a standard CRC32 value.
author Timo Sirainen <tss@iki.fi>
date Sat, 06 Feb 2010 01:16:26 +0200
parents fa1f5b4590d1
children 0454fde95cbf
files src/lib/crc32.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/crc32.c	Fri Jan 29 16:42:02 2010 +0200
+++ b/src/lib/crc32.c	Sat Feb 06 01:16:26 2010 +0200
@@ -60,28 +60,32 @@
 
 uint32_t crc32_data(const void *data, size_t size)
 {
-	return crc32_data_more((uint32_t)-1, data, size);
+	return crc32_data_more(0, data, size);
 }
 
 uint32_t crc32_data_more(uint32_t crc, const void *data, size_t size)
 {
 	const uint8_t *p = data, *end = p + size;
 
+	crc ^= 0xffffffff;
 	for (; p != end; p++)
 		crc = (crc >> 8) ^ crc32tab[((crc ^ *p) & 0xff)];
+	crc ^= 0xffffffff;
 	return crc;
 }
 
 uint32_t crc32_str(const char *str)
 {
-	return crc32_str_more((uint32_t)-1, str);
+	return crc32_str_more(0, str);
 }
 
 uint32_t crc32_str_more(uint32_t crc, const char *str)
 {
 	const uint8_t *p = (const uint8_t *)str;
 
+	crc ^= 0xffffffff;
 	for (; *p != '\0'; p++)
 		crc = (crc >> 8) ^ crc32tab[((crc ^ *p) & 0xff)];
+	crc ^= 0xffffffff;
 	return crc;
 }