walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttp2_hd_huffman: Code cleanup

This commit is contained in:
Tatsuhiro Tsujikawa 2013-11-05 23:34:58 +09:00
parent bc347d6bb9
commit d92a161c46
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/nghttp2_hd_huffman.c
View File

@ -100,20 +100,21 @@ static uint8_t huff_get_lsb_aligned(const nghttp2_huff_sym *sym,
size_t codebitoff, size_t codebitoff,
size_t nbits) size_t nbits)
{ {
uint8_t a = sym->code[codebitoff/8]; size_t codeidx = codebitoff / 8;
uint8_t a = sym->code[codeidx];
size_t localbitoff = codebitoff & 0x7; size_t localbitoff = codebitoff & 0x7;
size_t bitleft = 8 - localbitoff; size_t bitleft = 8 - localbitoff;
if(bitleft >= nbits) { if(bitleft >= nbits) {
return (a >> (bitleft - nbits)) & ((1 << nbits) - 1); return (a >> (bitleft - nbits)) & ((1 << nbits) - 1);
} else { } else {
uint8_t b = 0; size_t right = nbits - bitleft;
a &= ((1 << bitleft) - 1); a &= ((1 << bitleft) - 1);
a <<= nbits - bitleft; a <<= right;
if((sym->nbits + 7) / 8 > codebitoff / 8 + 1) { if((sym->nbits + 7) / 8 > codeidx + 1) {
b = sym->code[codebitoff / 8 + 1] >> (8 - (nbits - bitleft)); a |= sym->code[codeidx + 1] >> (8 - right);
} }
return a | b; return a;
} }
} }