From 1a43c89db39f46ce22d3071c859e5e52cc0c41d1 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Wed, 3 Sep 2014 12:08:04 +0700 Subject: [PATCH] Code cleanup: cleanup CRC.h and CRC.cpp --- CRC.cpp | 59 +++++++++++++++++++++++++++------------------------------ CRC.h | 4 ++-- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/CRC.cpp b/CRC.cpp index 40bfeb32..7dc05846 100644 --- a/CRC.cpp +++ b/CRC.cpp @@ -6,58 +6,55 @@ unsigned int CRCTable[ 256 ]; u32 Reflect( u32 ref, char ch ) { - u32 value = 0; + u32 value = 0; - // Swap bit 0 for bit 7 - // bit 1 for bit 6, etc. - for (int i = 1; i < (ch + 1); i++) - { - if(ref & 1) - value |= 1 << (ch - i); - ref >>= 1; - } - return value; + // Swap bit 0 for bit 7 + // bit 1 for bit 6, etc. + for (int i = 1; i < (ch + 1); ++i) { + if(ref & 1) + value |= 1 << (ch - i); + ref >>= 1; + } + return value; } void CRC_BuildTable() { - u32 crc; + u32 crc; - for (int i = 0; i < 256; i++) - { - crc = Reflect( i, 8 ) << 24; - for (int j = 0; j < 8; j++) + for (int i = 0; i < 256; ++i) { + crc = Reflect( i, 8 ) << 24; + for (int j = 0; j < 8; ++j) crc = (crc << 1) ^ (crc & (1 << 31) ? CRC32_POLYNOMIAL : 0); - - CRCTable[i] = Reflect( crc, 32 ); - } + + CRCTable[i] = Reflect( crc, 32 ); + } } -u32 CRC_Calculate( u32 crc, void *buffer, u32 count ) +u32 CRC_Calculate( u32 crc, const void * buffer, u32 count ) { - u8 *p; - u32 orig = crc; + u8 *p; + u32 orig = crc; - p = (u8*) buffer; - while (count--) + p = (u8*) buffer; + while (count--) crc = (crc >> 8) ^ CRCTable[(crc & 0xFF) ^ *p++]; - return crc ^ orig; + return crc ^ orig; } -u32 CRC_CalculatePalette( u32 crc, void *buffer, u32 count ) +u32 CRC_CalculatePalette(u32 crc, const void * buffer, u32 count ) { - u8 *p; - u32 orig = crc; + u8 *p; + u32 orig = crc; - p = (u8*) buffer; - while (count--) - { + p = (u8*) buffer; + while (count--) { crc = (crc >> 8) ^ CRCTable[(crc & 0xFF) ^ *p++]; crc = (crc >> 8) ^ CRCTable[(crc & 0xFF) ^ *p++]; p += 6; } - return crc ^ orig; + return crc ^ orig; } diff --git a/CRC.h b/CRC.h index 01527dee..f006cdea 100644 --- a/CRC.h +++ b/CRC.h @@ -2,5 +2,5 @@ void CRC_BuildTable(); -u32 CRC_Calculate( u32 crc, void *buffer, u32 count ); -u32 CRC_CalculatePalette( u32 crc, void *buffer, u32 count ); +u32 CRC_Calculate( u32 crc, const void *buffer, u32 count ); +u32 CRC_CalculatePalette( u32 crc, const void *buffer, u32 count );