diff options
author | Alfredo Cardigliano <cardigliano@ntop.org> | 2017-05-23 18:56:43 +0200 |
---|---|---|
committer | Alfredo Cardigliano <cardigliano@ntop.org> | 2017-05-23 18:56:43 +0200 |
commit | 1a20029c8254f53e00850667c1cb531347c1690f (patch) | |
tree | 2a1ef8c0d46c0f6511f7618873445dea5eaad6f8 /example | |
parent | 26bd42a71c249575837021d5d8a6ae4c5bfa57b6 (diff) |
compilation fixes
Diffstat (limited to 'example')
-rw-r--r-- | example/ndpi_util.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/example/ndpi_util.c b/example/ndpi_util.c index 1e7e498d0..e90400b8f 100644 --- a/example/ndpi_util.c +++ b/example/ndpi_util.c @@ -884,7 +884,8 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow, /* ********************************************************** */ static uint32_t crc32_for_byte(uint32_t r) { - for(int j = 0; j < 8; ++j) + int j; + for(j = 0; j < 8; ++j) r = (r & 1? 0: (uint32_t)0xEDB88320L) ^ r >> 1; return r ^ (uint32_t)0xFF000000L; } @@ -895,11 +896,12 @@ static uint32_t crc32_for_byte(uint32_t r) { typedef unsigned long accum_t; static void init_tables(uint32_t* table, uint32_t* wtable) { - for(size_t i = 0; i < 0x100; ++i) + size_t i, j, k, w; + for(i = 0; i < 0x100; ++i) table[i] = crc32_for_byte(i); - 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) + for(k = 0; k < sizeof(accum_t); ++k) + for(i = 0; i < 0x100; ++i) { + for(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); } @@ -908,14 +910,15 @@ static void init_tables(uint32_t* table, uint32_t* wtable) { 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(size_t i = 0; i < n_accum; ++i) { + for(i = 0; i < n_accum; ++i) { accum_t a = *crc ^ ((accum_t*)data)[i]; - for(size_t j = *crc = 0; j < sizeof(accum_t); ++j) + for(j = *crc = 0; j < sizeof(accum_t); ++j) *crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)]; } - for(size_t i = n_accum*sizeof(accum_t); i < n_bytes; ++i) + for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i) *crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8; } |