X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/0bd984429304da7c1c5509103e3dc04149028a95..a4589237d33eb5ed0858371a668f652651f4bcda:/crc32.h

diff --git a/crc32.h b/crc32.h
index 0c9610e..e6f7d10 100644
--- a/crc32.h
+++ b/crc32.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: crc32.h,v 1.3 1999/05/06 19:51:35 mdw Exp $
+ * $Id: crc32.h,v 1.7 2004/04/08 01:36:11 mdw Exp $
  *
  * Calculating cyclic redundancy values (non-cryptographic!)
  *
@@ -27,37 +27,29 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: crc32.h,v $
- * Revision 1.3  1999/05/06 19:51:35  mdw
- * Reformatted the LGPL notice a little bit.
- *
- * Revision 1.2  1999/05/05 18:50:31  mdw
- * Change licensing conditions to LGPL.
- *
- * Revision 1.1.1.1  1998/06/17 23:44:42  mdw
- * Initial version of mLib
- *
- */
-
-#ifndef CRC32_H
-#define CRC32_h
+#ifndef MLIB_CRC32_H
+#define MLIB_CRC32_H
 
 #ifdef __cplusplus
   extern "C" {
 #endif
 
+/*----- Header files ------------------------------------------------------*/
+
+#ifndef MLIB_BITS_H
+#  include "bits.h"
+#endif
+
 /*----- External values ---------------------------------------------------*/
 
-extern unsigned long crc32_table[256];
+extern uint32 crc32_table[256];
 
 /*----- Macros ------------------------------------------------------------*/
 
 /* --- @CRC32@ --- *
  *
- * Arguments:	@unsigned long result@ = where to put the result
- *		@unsigned long crc@ = carryover from previous call, or zero
+ * Arguments:	@uint32 result@ = where to put the result
+ *		@uint32 crc@ = carryover from previous call, or zero
  *		@void *buf@ = pointer to buffer to check
  *		@size_t sz@ = size of the buffer
  *
@@ -65,20 +57,20 @@ extern unsigned long crc32_table[256];
  */
 
 #define CRC32(result, crc, buf, sz) do {				\
-  const unsigned char *_p = (const unsigned char *)(buf);		\
-  const unsigned char *_l = _p + (sz);					\
-  unsigned long _crc = ~(crc) & 0xffffffffu;				\
+  const octet *_p = (const octet *)(buf);				\
+  const octet *_l = _p + (sz);						\
+  uint32 _crc = U32(~(crc));						\
 									\
   while (_p < _l)							\
-    _crc = (_crc >> 8) ^ crc32_table[(*_p++ ^ _crc) & 0xffu];		\
-  (result) = ~_crc & 0xffffffffu;					\
+    _crc = (_crc >> 8) ^ crc32_table[U8(*_p++ ^ _crc)];			\
+  (result) = U32(~_crc);						\
 } while (0)
 
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @crc32@ --- *
  *
- * Arguments:	@unsigned long crc@ = carryover from previous call, or zero
+ * Arguments:	@uint32 crc@ = carryover from previous call, or zero
  *		@const void *buf@ = pointer to buffer to check
  *		@size_t sz@ = size of the buffer
  *
@@ -88,8 +80,7 @@ extern unsigned long crc32_table[256];
  *		wrapper for the macro version.
  */
 
-extern unsigned long crc32(unsigned long /*crc*/,
-			   const void */*buf*/, size_t /*sz*/);
+extern uint32 crc32(uint32 /*crc*/, const void */*buf*/, size_t /*sz*/);
 
 /*----- That's all, folks -------------------------------------------------*/