forked from osmocom/wireshark
Revert "Fix warning:"
This reverts commit 39a31c3205
.
rv is used in an assert, thus breaking debug builds.
Change-Id: Ide9c287a9b6bfe07554a9429d3d216266d63c017
Reviewed-on: https://code.wireshark.org/review/8259
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
parent
6fa0a4c87e
commit
cbeaf034be
1 changed files with 2 additions and 1 deletions
|
@ -1733,6 +1733,7 @@ static int hd_inflate_remove_bufs(nghttp2_hd_inflater *inflater, nghttp2_nv *nv,
|
||||||
static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater,
|
static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater,
|
||||||
nghttp2_nv *nv,
|
nghttp2_nv *nv,
|
||||||
nghttp2_hd_entry *ent_name) {
|
nghttp2_hd_entry *ent_name) {
|
||||||
|
size_t rv;
|
||||||
size_t buflen;
|
size_t buflen;
|
||||||
uint8_t *buf;
|
uint8_t *buf;
|
||||||
nghttp2_mem *mem;
|
nghttp2_mem *mem;
|
||||||
|
@ -1750,7 +1751,7 @@ static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater,
|
||||||
|
|
||||||
/* Copy including terminal NULL */
|
/* Copy including terminal NULL */
|
||||||
memcpy(buf, ent_name->nv.name, ent_name->nv.namelen + 1);
|
memcpy(buf, ent_name->nv.name, ent_name->nv.namelen + 1);
|
||||||
nghttp2_bufs_remove_copy(&inflater->nvbufs,
|
rv = nghttp2_bufs_remove_copy(&inflater->nvbufs,
|
||||||
buf + ent_name->nv.namelen + 1);
|
buf + ent_name->nv.namelen + 1);
|
||||||
assert(ent_name->nv.namelen + 1 + rv == buflen);
|
assert(ent_name->nv.namelen + 1 + rv == buflen);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue