diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-09-02 22:53:05 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-09-03 06:05:43 +0000 |
| commit | 2be3820912ecee71f0feb5fcc36fdfa53041908d (patch) | |
| tree | 9a0ca48cdbe7f70833ac5fcfb663ac70938e91a5 /epan/dissectors/packet-http2.c | |
| parent | 32e785f81320342058bbee95f84095cd55449c09 (diff) | |
Address "shadow" warnings found by checkAPI script.
These aren't "true" shadow issues, but the script doesn't completely understand C syntax (for things like struct member names "time" and "index"). But fixing them creates less noise.
Change-Id: I5a2db1549095824530428529e86cab453c031a04
Reviewed-on: https://code.wireshark.org/review/10368
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-http2.c')
| -rw-r--r-- | epan/dissectors/packet-http2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index ffb85558b4..e43e8a333a 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -79,7 +79,7 @@ typedef struct { guint datalen; /* name index or name/value index if type is one of HTTP2_HD_INDEXED and HTTP2_HD_*_INDEXED_NAMEs */ - guint index; + guint idx; } data; /* header table size if type == HTTP2_HD_HEADER_TABLE_SIZE_UPDATE */ guint header_table_size; @@ -685,7 +685,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, out->type = header_repr_info->type; out->length = rv; - out->table.data.index = header_repr_info->integer; + out->table.data.idx = header_repr_info->integer; out->table.data.datalen = (guint)(4 + nv.namelen + 4 + nv.valuelen); @@ -820,7 +820,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, in->type == HTTP2_HD_LITERAL_INDEXING_INDEXED_NAME || in->type == HTTP2_HD_LITERAL_INDEXED_NAME || in->type == HTTP2_HD_LITERAL_NEVER_INDEXING_INDEXED_NAME) { - proto_tree_add_uint(header_tree, hf_http2_header_index, tvb, offset, in->length, in->table.data.index); + proto_tree_add_uint(header_tree, hf_http2_header_index, tvb, offset, in->length, in->table.data.idx); } proto_item_append_text(header, ": %s: %s", header_name, header_value); |