crc32 fix

1 files changed, 17 insertions, 17 deletions

diff --git a/example/ndpi_util.c b/example/ndpi_util.c
index d6836176a..1e7e498d0 100644
--- a/example/ndpi_util.c
+++ b/example/ndpi_util.c
@@ -884,10 +884,8 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
 /* ********************************************************** */
 
 static uint32_t crc32_for_byte(uint32_t r) {
-  int j;
-
-  for(j = 0; j < 8; ++j)
-    r = ((r & 1) ? 0 : ((uint32_t)0xEDB88320L) ^ r >> 1);
+  for(int j = 0; j < 8; ++j)
+    r = (r & 1? 0: (uint32_t)0xEDB88320L) ^ r >> 1;
   return r ^ (uint32_t)0xFF000000L;
 }
 
@@ -897,31 +895,33 @@ static uint32_t crc32_for_byte(uint32_t r) {
 typedef unsigned long accum_t;
 
 static void init_tables(uint32_t* table, uint32_t* wtable) {
-  size_t i, k, w, j;
-
-  for(i = 0; i < 0x100; ++i)
+  for(size_t i = 0; i < 0x100; ++i)
     table[i] = crc32_for_byte(i);
-  for(k = 0; k < sizeof(accum_t); ++k)
-    for(i = 0; i < 0x100; ++i) {
-      for(j = w = 0; j < sizeof(accum_t); ++j)
+  for(size_t k = 0; k < sizeof(accum_t); ++k)
+    for(size_t w, i = 0; i < 0x100; ++i) {
+      for(size_t j = w = 0; j < sizeof(accum_t); ++j)
 	w = table[(uint8_t)(j == k? w ^ i: w)] ^ w >> 8;
       wtable[(k << 8) + i] = w ^ (k? wtable[0]: 0);
     }
 }
 
-void ethernet_crc32(const void* data, size_t n_bytes, uint32_t* crc) {
+static void __crc32(const void* data, size_t n_bytes, uint32_t* crc) {
   static uint32_t table[0x100], wtable[0x100*sizeof(accum_t)];
   size_t n_accum = n_bytes/sizeof(accum_t);
-  size_t i, j;
-
   if(!*table)
     init_tables(table, wtable);
-  for(i = 0; i < n_accum; ++i) {
+  for(size_t i = 0; i < n_accum; ++i) {
     accum_t a = *crc ^ ((accum_t*)data)[i];
-    for(j = *crc = 0; j < sizeof(accum_t); ++j)
+    for(size_t j = *crc = 0; j < sizeof(accum_t); ++j)
       *crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)];
   }
-
-  for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
+  for(size_t i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
     *crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8;
 }
+
+u_int32_t ethernet_crc32(const void* data, size_t n_bytes) {
+  u_int32_t crc = 0;
+  __crc32(data, n_bytes, &crc);
+  return crc;
+}
+