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

Merge branch 'alagoutte-misc'

This commit is contained in:
Tatsuhiro Tsujikawa 2014-08-05 01:06:15 +09:00
parent 4bbb4172aa ec93c9f55f
commit 04e94824a0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nghttp2_buf.c
View File

@ -236,8 +236,8 @@ ssize_t nghttp2_bufs_len(nghttp2_bufs *bufs)
static ssize_t bufs_avail(nghttp2_bufs *bufs) static ssize_t bufs_avail(nghttp2_bufs *bufs)
{ {
return (ssize_t)nghttp2_buf_avail(&bufs->cur->buf) + return (ssize_t)(nghttp2_buf_avail(&bufs->cur->buf) +
(bufs->chunk_length - bufs->offset) * (bufs->max_chunk - bufs->chunk_used); (bufs->chunk_length - bufs->offset) * (bufs->max_chunk - bufs->chunk_used));
} }
static int bufs_alloc_chain(nghttp2_bufs *bufs) static int bufs_alloc_chain(nghttp2_bufs *bufs)

12
lib/nghttp2_hd.c
View File

@ -515,7 +515,7 @@ static ssize_t decode_length(uint32_t *res, size_t *shift_ptr, int *final,
if(++in == last) { if(++in == last) {
*res = n; *res = n;
return in - start; return (ssize_t)(in - start);
} }
} }
@ -545,12 +545,12 @@ static ssize_t decode_length(uint32_t *res, size_t *shift_ptr, int *final,
if(in == last) { if(in == last) {
*res = n; *res = n;
return in - start; return (ssize_t)(in - start);
} }
*res = n; *res = n;
*final = 1; *final = 1;
return in + 1 - start; return (ssize_t)(in + 1 - start);
} }
static int emit_table_size(nghttp2_bufs *bufs, size_t table_size) static int emit_table_size(nghttp2_bufs *bufs, size_t table_size)
@ -871,10 +871,10 @@ static search_result search_hd_table(nghttp2_hd_context *context,
nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, i); nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, i);
if(ent->name_hash == name_hash && name_eq(&ent->nv, nv)) { if(ent->name_hash == name_hash && name_eq(&ent->nv, nv)) {
if(res.index == -1) { if(res.index == -1) {
res.index = (ssize_t)i + NGHTTP2_STATIC_TABLE_LENGTH; res.index = (ssize_t)(i + NGHTTP2_STATIC_TABLE_LENGTH);
} }
if(ent->value_hash == value_hash && value_eq(&ent->nv, nv)) { if(ent->value_hash == value_hash && value_eq(&ent->nv, nv)) {
res.index = (ssize_t)i + NGHTTP2_STATIC_TABLE_LENGTH; res.index = (ssize_t)(i + NGHTTP2_STATIC_TABLE_LENGTH);
res.name_value_match = 1; res.name_value_match = 1;
return res; return res;
} }
@ -1810,7 +1810,7 @@ ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater,
goto fail; goto fail;
} }
return in - first; return (ssize_t)(in - first);
fail: fail:
DEBUGF(fprintf(stderr, "inflatehd: error return %zd\n", rv)); DEBUGF(fprintf(stderr, "inflatehd: error return %zd\n", rv));