Make the return type of `crc32' a `uint32' now that we have `bits.h'.

diff --git a/crc32.c b/crc32.c
index daa136be5b5d6953c29c91335483cd3157f44a60..5f476657198fa4e669fc3bb9c8365aebf416d73e 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: crc32.c,v 1.3 1999/05/06 19:51:35 mdw Exp $
+ * $Id: crc32.c,v 1.4 1999/06/01 09:47:22 mdw Exp $
  *
  * Calculating cyclic redundancy values (non-cryptographic!)
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: crc32.c,v $
+ * Revision 1.4  1999/06/01 09:47:22  mdw
+ * Make the return type of `crc32' a `uint32' now that we have `bits.h'.
+ *
  * Revision 1.3  1999/05/06 19:51:35  mdw
  * Reformatted the LGPL notice a little bit.
  *
@@ -51,6 +54,7 @@
 
 /* --- Local headers --- */
 
+#include "bits.h"
 #include "crc32.h"
 
 /*----- CRC table ---------------------------------------------------------*/
@@ -68,78 +72,78 @@
  *   check = crc(123456789) = 0xCBF43926
  */
 
-unsigned long crc32_table[256] = {
-  0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
-  0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
-  0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
-  0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
-  0x1DB71064L, 0x6AB020F2L, 0xF3B97148L, 0x84BE41DEL,
-  0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L, 0x83D385C7L,
-  0x136C9856L, 0x646BA8C0L, 0xFD62F97AL, 0x8A65C9ECL,
-  0x14015C4FL, 0x63066CD9L, 0xFA0F3D63L, 0x8D080DF5L,
-  0x3B6E20C8L, 0x4C69105EL, 0xD56041E4L, 0xA2677172L,
-  0x3C03E4D1L, 0x4B04D447L, 0xD20D85FDL, 0xA50AB56BL,
-  0x35B5A8FAL, 0x42B2986CL, 0xDBBBC9D6L, 0xACBCF940L,
-  0x32D86CE3L, 0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L,
-  0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L,
-  0x21B4F4B5L, 0x56B3C423L, 0xCFBA9599L, 0xB8BDA50FL,
-  0x2802B89EL, 0x5F058808L, 0xC60CD9B2L, 0xB10BE924L,
-  0x2F6F7C87L, 0x58684C11L, 0xC1611DABL, 0xB6662D3DL,
-  0x76DC4190L, 0x01DB7106L, 0x98D220BCL, 0xEFD5102AL,
-  0x71B18589L, 0x06B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L,
-  0x7807C9A2L, 0x0F00F934L, 0x9609A88EL, 0xE10E9818L,
-  0x7F6A0DBBL, 0x086D3D2DL, 0x91646C97L, 0xE6635C01L,
-  0x6B6B51F4L, 0x1C6C6162L, 0x856530D8L, 0xF262004EL,
-  0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L,
-  0x65B0D9C6L, 0x12B7E950L, 0x8BBEB8EAL, 0xFCB9887CL,
-  0x62DD1DDFL, 0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L,
-  0x4DB26158L, 0x3AB551CEL, 0xA3BC0074L, 0xD4BB30E2L,
-  0x4ADFA541L, 0x3DD895D7L, 0xA4D1C46DL, 0xD3D6F4FBL,
-  0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L,
-  0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L,
-  0x5005713CL, 0x270241AAL, 0xBE0B1010L, 0xC90C2086L,
-  0x5768B525L, 0x206F85B3L, 0xB966D409L, 0xCE61E49FL,
-  0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L, 0xC7D7A8B4L,
-  0x59B33D17L, 0x2EB40D81L, 0xB7BD5C3BL, 0xC0BA6CADL,
-  0xEDB88320L, 0x9ABFB3B6L, 0x03B6E20CL, 0x74B1D29AL,
-  0xEAD54739L, 0x9DD277AFL, 0x04DB2615L, 0x73DC1683L,
-  0xE3630B12L, 0x94643B84L, 0x0D6D6A3EL, 0x7A6A5AA8L,
-  0xE40ECF0BL, 0x9309FF9DL, 0x0A00AE27L, 0x7D079EB1L,
-  0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL,
-  0xF762575DL, 0x806567CBL, 0x196C3671L, 0x6E6B06E7L,
-  0xFED41B76L, 0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL,
-  0xF9B9DF6FL, 0x8EBEEFF9L, 0x17B7BE43L, 0x60B08ED5L,
-  0xD6D6A3E8L, 0xA1D1937EL, 0x38D8C2C4L, 0x4FDFF252L,
-  0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL,
-  0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L, 0x41047A60L,
-  0xDF60EFC3L, 0xA867DF55L, 0x316E8EEFL, 0x4669BE79L,
-  0xCB61B38CL, 0xBC66831AL, 0x256FD2A0L, 0x5268E236L,
-  0xCC0C7795L, 0xBB0B4703L, 0x220216B9L, 0x5505262FL,
-  0xC5BA3BBEL, 0xB2BD0B28L, 0x2BB45A92L, 0x5CB36A04L,
-  0xC2D7FFA7L, 0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL,
-  0x9B64C2B0L, 0xEC63F226L, 0x756AA39CL, 0x026D930AL,
-  0x9C0906A9L, 0xEB0E363FL, 0x72076785L, 0x05005713L,
-  0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL, 0x0CB61B38L,
-  0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L, 0x0BDBDF21L,
-  0x86D3D2D4L, 0xF1D4E242L, 0x68DDB3F8L, 0x1FDA836EL,
-  0x81BE16CDL, 0xF6B9265BL, 0x6FB077E1L, 0x18B74777L,
-  0x88085AE6L, 0xFF0F6A70L, 0x66063BCAL, 0x11010B5CL,
-  0x8F659EFFL, 0xF862AE69L, 0x616BFFD3L, 0x166CCF45L,
-  0xA00AE278L, 0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L,
-  0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL,
-  0xAED16A4AL, 0xD9D65ADCL, 0x40DF0B66L, 0x37D83BF0L,
-  0xA9BCAE53L, 0xDEBB9EC5L, 0x47B2CF7FL, 0x30B5FFE9L,
-  0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L, 0x24B4A3A6L,
-  0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL,
-  0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L,
-  0xB40BBE37L, 0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL,
+uint32 crc32_table[256] = {
+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+  0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+  0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+  0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+  0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+  0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+  0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+  0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+  0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+  0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+  0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+  0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+  0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+  0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+  0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+  0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+  0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+  0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+  0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+  0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+  0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+  0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+  0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+  0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+  0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+  0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+  0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+  0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+  0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+  0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+  0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+  0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+  0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+  0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+  0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+  0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+  0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+  0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+  0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+  0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+  0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+  0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+  0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
 };
 
 /*----- Functionc 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
  *
@@ -149,9 +153,9 @@ unsigned long crc32_table[256] = {
  *             wrapper for the macro version.
  */
 
-unsigned long crc32(unsigned long crc, const void *buf, size_t sz)
+uint32 crc32(uint32 crc, const void *buf, size_t sz)
 {
-  unsigned long c;
+  uint32 c;
   CRC32(c, crc, buf, sz);
   return (c);
 }
@@ -164,7 +168,7 @@ unsigned long crc32(unsigned long crc, const void *buf, size_t sz)
 
 int main(void)
 {
-  unsigned long crc = 0;
+  uint32 crc = 0;
   char buf[BUFSIZ];
   int r;
 
@@ -174,7 +178,7 @@ int main(void)
       crc = crc32(crc, buf, r);
   } while (r == sizeof(buf));
 
-  printf("crc32(stdin) = %08lx\n", crc);
+  printf("crc32(stdin) = %08lx\n", (unsigned long)crc);
   return (0);
 }
 

diff --git a/crc32.h b/crc32.h
index 0c9610e4086e3571791094901d4930ba340637c9..57899f8b442a1ec5a755c2adabeb34ce65eb73d7 100644 (file)
--- 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.4 1999/06/01 09:47:22 mdw Exp $
  *
  * Calculating cyclic redundancy values (non-cryptographic!)
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: crc32.h,v $
+ * Revision 1.4  1999/06/01 09:47:22  mdw
+ * Make the return type of `crc32' a `uint32' now that we have `bits.h'.
+ *
  * Revision 1.3  1999/05/06 19:51:35  mdw
  * Reformatted the LGPL notice a little bit.
  *
@@ -48,16 +51,22 @@
   extern "C" {
 #endif
 
+/*----- Header files ------------------------------------------------------*/
+
+#ifndef 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 +74,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 +97,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 -------------------------------------------------*/