[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19017 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19017 - in gnunet/src: include util |
Date: |
Thu, 5 Jan 2012 21:18:50 +0100 |
Author: grothoff
Date: 2012-01-05 21:18:50 +0100 (Thu, 05 Jan 2012)
New Revision: 19017
Modified:
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/util/crypto_crc.c
Log:
fix crc16 prototypes
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2012-01-05 20:00:45 UTC (rev
19016)
+++ gnunet/src/include/gnunet_crypto_lib.h 2012-01-05 20:18:50 UTC (rev
19017)
@@ -238,12 +238,12 @@
* 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);
/**
@@ -259,12 +259,12 @@
/**
* 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);
/**
Modified: gnunet/src/util/crypto_crc.c
===================================================================
--- gnunet/src/util/crypto_crc.c 2012-01-05 20:00:45 UTC (rev 19016)
+++ gnunet/src/util/crypto_crc.c 2012-01-05 20:18:50 UTC (rev 19017)
@@ -118,13 +118,14 @@
* 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 @@
/**
* 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19017 - in gnunet/src: include util,
gnunet <=