git://wimlib.net
/
wimlib
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c1c129
)
Silence compiler warning in make_huffman_decode_table()
author
Eric Biggers
<ebiggers3@gmail.com>
Tue, 11 Nov 2014 00:34:25 +0000
(18:34 -0600)
committer
Eric Biggers
<ebiggers3@gmail.com>
Tue, 11 Nov 2014 00:34:25 +0000
(18:34 -0600)
src/decompress_common.c
patch
|
blob
|
history
diff --git
a/src/decompress_common.c
b/src/decompress_common.c
index b56fc3fbedbcf2535961c54ad9bf6fa46d4d2009..66440efe203acaed25f56d6a45ddf07d12c25ab7 100644
(file)
--- a/
src/decompress_common.c
+++ b/
src/decompress_common.c
@@
-292,13
+292,7
@@
make_huffman_decode_table(u16 decode_table[const restrict],
v = MAKE_DIRECT_ENTRY(sorted_syms[sym_idx], codeword_len);
v |= v << 16;
v = MAKE_DIRECT_ENTRY(sorted_syms[sym_idx], codeword_len);
v |= v << 16;
- if (sizeof(unsigned long) == 8) {
- /* This may produce a compiler warning if an
- * 'unsigned long' is 32 bits, but this won't be
- * executed unless an 'unsigned long' is at
- * least 64 bits anyway. */
- v |= v << 32;
- }
+ v |= v << (sizeof(unsigned long) == 8 ? 32 : 0);
p = (aliased_long_t *)decode_table_ptr;
n = stores_per_loop;
p = (aliased_long_t *)decode_table_ptr;
n = stores_per_loop;