openstack/deb-libisal
Code Issues Proposed changes

igzip: Remove unnecessary casts causing warnings in 32bit build

Browse Source 
Change-Id: I9fb85c097c9ade8fdc7907e9d6533d1997ccd406
Signed-off-by: Greg Tucker <greg.b.tucker@intel.com>
This commit is contained in:
Greg Tucker 2017-03-27 13:54:47 -07:00
parent 181cc20404
commit c28be0d306
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
igzip/huff_codes.c
View File

@ -686,8 +686,8 @@ void isal_update_histogram_base(uint8_t * start_stream, int length,
literal = *(uint32_t *) current; literal = *(uint32_t *) current;
hash = compute_hash(literal) & HASH_MASK; hash = compute_hash(literal) & HASH_MASK;
seen = last_seen[hash]; seen = last_seen[hash];
last_seen[hash] = ((uint64_t) current - (uint64_t) start_stream) & 0xFFFF; last_seen[hash] = (current - start_stream) & 0xFFFF;
dist = ((uint64_t) current - (uint64_t) start_stream - seen) & 0xFFFF; dist = (current - start_stream - seen) & 0xFFFF;
if (dist - 1 < D - 1) { if (dist - 1 < D - 1) {
assert(start_stream <= current - dist); assert(start_stream <= current - dist);
match_length = match_length =
@ -705,9 +705,7 @@ void isal_update_histogram_base(uint8_t * start_stream, int length,
for (; next_hash < end; next_hash++) { for (; next_hash < end; next_hash++) {
literal = *(uint32_t *) next_hash; literal = *(uint32_t *) next_hash;
hash = compute_hash(literal) & HASH_MASK; hash = compute_hash(literal) & HASH_MASK;
last_seen[hash] = last_seen[hash] = (next_hash - start_stream) & 0xFFFF;
((uint64_t) next_hash -
(uint64_t) start_stream) & 0xFFFF;
} }
dist_histogram[convert_dist_to_dist_sym(dist)] += 1; dist_histogram[convert_dist_to_dist_sym(dist)] += 1;
@ -722,8 +720,8 @@ void isal_update_histogram_base(uint8_t * start_stream, int length,
literal = literal >> 8; literal = literal >> 8;
hash = compute_hash(literal) & HASH_MASK; hash = compute_hash(literal) & HASH_MASK;
seen = last_seen[hash]; seen = last_seen[hash];
last_seen[hash] = ((uint64_t) current - (uint64_t) start_stream) & 0xFFFF; last_seen[hash] = (current - start_stream) & 0xFFFF;
dist = ((uint64_t) current - (uint64_t) start_stream - seen) & 0xFFFF; dist = (current - start_stream - seen) & 0xFFFF;
if (dist < D) { if (dist < D) {
match_length = compare258(current - dist, current, end_stream - current); match_length = compare258(current - dist, current, end_stream - current);
if (match_length >= SHORTEST_MATCH) { if (match_length >= SHORTEST_MATCH) {