CRC: Added const keywords.

diff --git a/ucw/crc-tables.c b/ucw/crc-tables.c
index 40a4ac6d1d93abd9d2d850fa980ebfcfdb61b32c..bb05d326a5c8dd224bdaea03498829e9a2e9dc5d 100644 (file)
--- a/ucw/crc-tables.c
+++ b/ucw/crc-tables.c
@@ -33,7 +33,7 @@
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o32[256] =
+const u32 crc_tableil8_o32[256] =
 {
  0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
  0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B, 0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
@@ -89,7 +89,7 @@ u32 crc_tableil8_o32[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o40[256] =
+const u32 crc_tableil8_o40[256] =
 {
  0x00000000, 0x13A29877, 0x274530EE, 0x34E7A899, 0x4E8A61DC, 0x5D28F9AB, 0x69CF5132, 0x7A6DC945,
  0x9D14C3B8, 0x8EB65BCF, 0xBA51F356, 0xA9F36B21, 0xD39EA264, 0xC03C3A13, 0xF4DB928A, 0xE7790AFD,
@@ -145,7 +145,7 @@ u32 crc_tableil8_o40[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o48[256] =
+const u32 crc_tableil8_o48[256] =
 {
  0x00000000, 0xA541927E, 0x4F6F520D, 0xEA2EC073, 0x9EDEA41A, 0x3B9F3664, 0xD1B1F617, 0x74F06469,
  0x38513EC5, 0x9D10ACBB, 0x773E6CC8, 0xD27FFEB6, 0xA68F9ADF, 0x03CE08A1, 0xE9E0C8D2, 0x4CA15AAC,
@@ -201,7 +201,7 @@ u32 crc_tableil8_o48[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o56[256] =
+const u32 crc_tableil8_o56[256] =
 {
  0x00000000, 0xDD45AAB8, 0xBF672381, 0x62228939, 0x7B2231F3, 0xA6679B4B, 0xC4451272, 0x1900B8CA,
  0xF64463E6, 0x2B01C95E, 0x49234067, 0x9466EADF, 0x8D665215, 0x5023F8AD, 0x32017194, 0xEF44DB2C,
@@ -257,7 +257,7 @@ u32 crc_tableil8_o56[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o64[256] =
+const u32 crc_tableil8_o64[256] =
 {
  0x00000000, 0x38116FAC, 0x7022DF58, 0x4833B0F4, 0xE045BEB0, 0xD854D11C, 0x906761E8, 0xA8760E44,
  0xC5670B91, 0xFD76643D, 0xB545D4C9, 0x8D54BB65, 0x2522B521, 0x1D33DA8D, 0x55006A79, 0x6D1105D5,
@@ -313,7 +313,7 @@ u32 crc_tableil8_o64[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o72[256] =
+const u32 crc_tableil8_o72[256] =
 {
  0x00000000, 0xEF306B19, 0xDB8CA0C3, 0x34BCCBDA, 0xB2F53777, 0x5DC55C6E, 0x697997B4, 0x8649FCAD,
  0x6006181F, 0x8F367306, 0xBB8AB8DC, 0x54BAD3C5, 0xD2F32F68, 0x3DC34471, 0x097F8FAB, 0xE64FE4B2,
@@ -369,7 +369,7 @@ u32 crc_tableil8_o72[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o80[256] =
+const u32 crc_tableil8_o80[256] =
 {
  0x00000000, 0x68032CC8, 0xD0065990, 0xB8057558, 0xA5E0C5D1, 0xCDE3E919, 0x75E69C41, 0x1DE5B089,
  0x4E2DFD53, 0x262ED19B, 0x9E2BA4C3, 0xF628880B, 0xEBCD3882, 0x83CE144A, 0x3BCB6112, 0x53C84DDA,
@@ -425,7 +425,7 @@ u32 crc_tableil8_o80[256] =
  * File Name = ............................ 8x256_tables.c
  */
 
-u32 crc_tableil8_o88[256] =
+const u32 crc_tableil8_o88[256] =
 {
  0x00000000, 0x493C7D27, 0x9278FA4E, 0xDB448769, 0x211D826D, 0x6821FF4A, 0xB3657823, 0xFA590504,
  0x423B04DA, 0x0B0779FD, 0xD043FE94, 0x997F83B3, 0x632686B7, 0x2A1AFB90, 0xF15E7CF9, 0xB86201DE,

diff --git a/ucw/crc-tables.h b/ucw/crc-tables.h
index c87850bb7cb8f8ed2ec6d4fdfa292bface19a519..d93d3379c7ab985afa19adc94a384c76d5688227 100644 (file)
--- a/ucw/crc-tables.h
+++ b/ucw/crc-tables.h
@@ -27,11 +27,11 @@
 #define crc_tableil8_o88 ucw_crc_tableil8_o88
 #endif
 
-extern u32 crc_tableil8_o32[256];
-extern u32 crc_tableil8_o40[256];
-extern u32 crc_tableil8_o48[256];
-extern u32 crc_tableil8_o56[256];
-extern u32 crc_tableil8_o64[256];
-extern u32 crc_tableil8_o72[256];
-extern u32 crc_tableil8_o80[256];
-extern u32 crc_tableil8_o88[256];
+extern const u32 crc_tableil8_o32[256];
+extern const u32 crc_tableil8_o40[256];
+extern const u32 crc_tableil8_o48[256];
+extern const u32 crc_tableil8_o56[256];
+extern const u32 crc_tableil8_o64[256];
+extern const u32 crc_tableil8_o72[256];
+extern const u32 crc_tableil8_o80[256];
+extern const u32 crc_tableil8_o88[256];

diff --git a/ucw/crc.c b/ucw/crc.c
index 830d147cde15112588116caa6c781a78200b5370..070a261642db4df11a994f0361165860c5af10b5 100644 (file)
--- a/ucw/crc.c
+++ b/ucw/crc.c
@@ -32,7 +32,8 @@ static void crc32_update_by4(crc32_context *ctx, const byte *buf, uint len)
 {
   uint init_bytes, words;
   u32 crc = ctx->state;
-  u32 term1, term2, *buf32;
+  u32 term1, term2;
+  const u32 *buf32;
 
   // Special case
   if (len < 4)
@@ -51,7 +52,7 @@ static void crc32_update_by4(crc32_context *ctx, const byte *buf, uint len)
   // Process 4 bytes at a time
   words = len/4;
   len -= 4*words;
-  buf32 = (u32 *) buf;
+  buf32 = (const u32 *) buf;
   while (words--)
     {
       crc ^= *buf32++;
@@ -63,7 +64,7 @@ static void crc32_update_by4(crc32_context *ctx, const byte *buf, uint len)
     }
 
   // Process remaining up to 7 bytes
-  buf = (byte *) buf32;
+  buf = (const byte *) buf32;
 small:
   while (len--)
     crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);
@@ -75,7 +76,8 @@ static void crc32_update_by8(crc32_context *ctx, const byte *buf, uint len)
 {
   uint init_bytes, quads;
   u32 crc = ctx->state;
-  u32 term1, term2, *buf32;
+  u32 term1, term2;
+  const u32 *buf32;
 
   // Special case
   if (len < 8)
@@ -94,7 +96,7 @@ static void crc32_update_by8(crc32_context *ctx, const byte *buf, uint len)
   // Process 8 bytes at a time
   quads = len/8;
   len -= 8*quads;
-  buf32 = (u32 *) buf;
+  buf32 = (const u32 *) buf;
   while (quads--)
     {
       crc ^= *buf32++;
@@ -116,7 +118,7 @@ static void crc32_update_by8(crc32_context *ctx, const byte *buf, uint len)
     }
 
   // Process remaining up to 7 bytes
-  buf = (byte *) buf32;
+  buf = (const byte *) buf32;
 small:
   while (len--)
     crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);