From 2df23abd0a1e5a67c3a2ae362fa2f4641f1ebe6d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 5 Jan 2012 20:18:50 +0000 Subject: fix crc16 prototypes --- src/util/crypto_crc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/util/crypto_crc.c') diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c index c6cd83a74..bf8e058ad 100644 --- a/src/util/crypto_crc.c +++ b/src/util/crypto_crc.c @@ -118,13 +118,14 @@ GNUNET_CRYPTO_crc32_n (const void *buf, size_t len) * Perform an incremental step in a CRC16 (for TCP/IP) calculation. * * @param sum current sum, initially 0 - * @param hdr buffer to calculate CRC over (must be 16-bit aligned) + * @param buf buffer to calculate CRC over (must be 16-bit aligned) * @param len number of bytes in hdr, must be multiple of 2 * @return updated crc sum (must be subjected to GNUNET_CRYPTO_crc16_finish to get actual crc16) */ uint32_t -GNUNET_CRYPTO_crc16_step (uint32_t sum, uint16_t * hdr, size_t len) +GNUNET_CRYPTO_crc16_step (uint32_t sum, const void *buf, size_t len) { + uint16_t *hdr = buf; for (; len >= 2; len -= 2) sum += *(hdr++); if (len == 1) @@ -151,13 +152,14 @@ GNUNET_CRYPTO_crc16_finish (uint32_t sum) /** * Calculate the checksum of a buffer in one step. * - * @param hdr buffer to calculate CRC over (must be 16-bit aligned) + * @param buf buffer to calculate CRC over (must be 16-bit aligned) * @param len number of bytes in hdr, must be multiple of 2 * @return crc16 value */ uint16_t -GNUNET_CRYPTO_crc16_n (uint16_t *hdr, size_t len) +GNUNET_CRYPTO_crc16_n (const void *buf, size_t len) { + uint16_t *hdr = buf; uint32_t sum = GNUNET_CRYPTO_crc16_step (0, hdr, len); return GNUNET_CRYPTO_crc16_finish (sum); -- cgit v1.2.3