osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Resolve hf_ field name conflicts with protocol strings. 

Change-Id: Ie719e2f14c6eaf536035ab30dcb40e91c431c6e4
Reviewed-on: https://code.wireshark.org/review/14061
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-02-21 14:24:11 -05:00
parent 7e55f4102c
commit d1f5b376fa
6 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-btatt.c
View File

@ -11809,7 +11809,7 @@ proto_register_btgatt(void)
NULL, HFILL}
},
{&hf_gatt_nordic_dfu_packet,
{"Packet", "btgatt.nordic.dfu.packet",
{"Packet", "btgatt.nordic.dfu.packet.data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},

10
epan/dissectors/packet-c15ch.c
View File

@ -86,7 +86,6 @@ static int proto_c15ch = -1;
static dissector_table_t c15ch_dissector_table;
/* Fields */
static int hf_c15ch = -1;
static int hf_c15ch_version = -1;
static int hf_c15ch_msgtype = -1;
static int hf_c15ch_size = -1;
@ -4202,7 +4201,6 @@ static int dissect_c15ch_hbeat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
static int dissect_c15ch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item * ti = NULL;
proto_item * t_extra = NULL;
proto_tree * c15ch_tree = NULL;
proto_tree * src_ni_tn_tree = NULL;
proto_tree * dest_ni_tn_tree = NULL;
@ -4233,8 +4231,6 @@ static int dissect_c15ch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
proto_item_append_text(ti, ", Type: %s",
val_to_str_ext(msg_type, &c15_msg_types_ext, "Unknown Type: %d"));
c15ch_tree = proto_item_add_subtree(ti, ett_c15ch);
t_extra = proto_tree_add_item(c15ch_tree, hf_c15ch, tvb, 0, -1, ENC_NA);
PROTO_ITEM_SET_HIDDEN( t_extra ); /* allow filtering on "c15" but do not display in tree */
proto_tree_add_item(c15ch_tree, hf_c15ch_version, tvb, 0, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(c15ch_tree, hf_c15ch_msgtype, tvb, 4, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(c15ch_tree, hf_c15ch_size, tvb, 8, 4, ENC_BIG_ENDIAN);
@ -7459,12 +7455,6 @@ void proto_register_c15ch(void)
/* fields for C15 header : base c15 dissector for non-heartbeat packets */
/* first level of dissection */
static hf_register_info hf[] = {
{ &hf_c15ch,
{"C15 Call History", "c15",
FT_NONE, BASE_NONE,
NULL,
0x0, NULL, HFILL }
},
{ &hf_c15ch_version,
{"Version", "c15.ch.version",
FT_UINT32, BASE_DEC,

8
epan/dissectors/packet-http-urlencoded.c
View File

@ -36,9 +36,6 @@ static header_field_info *hfi_urlencoded = NULL;
#define URLENCODED_HFI_INIT HFI_INIT(proto_urlencoded)
static header_field_info hfi_form_keyvalue URLENCODED_HFI_INIT =
{ "Form item", "urlencoded-form", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
static header_field_info hfi_form_key URLENCODED_HFI_INIT =
{ "Key", "urlencoded-form.key", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL };
@ -153,9 +150,7 @@ dissect_form_urlencoded(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
const int start_offset = offset;
char *key, *value;
ti = proto_tree_add_item(url_tree, &hfi_form_keyvalue, tvb, offset, 0, ENC_NA);
sub = proto_item_add_subtree(ti, ett_form_keyvalue);
sub = proto_tree_add_subtree(url_tree, tvb, offset, 0, ett_form_keyvalue, &ti, "Form item");
next_offset = get_form_key_value(tvb, &key, offset, '=');
if (next_offset == -1)
@ -184,7 +179,6 @@ proto_register_http_urlencoded(void)
{
#ifndef HAVE_HFI_SECTION_INIT
static header_field_info *hfi[] = {
&hfi_form_keyvalue,
&hfi_form_key,
&hfi_form_value,
};

8
epan/dissectors/packet-infiniband_sdp.c
View File

@ -46,8 +46,6 @@ static int proto_infiniband = -1; /* we'll need the Infiniband protocol index
/* Initialize the protocol and registered fields... */
static int proto_ib_sdp = -1;
static int hf_ib_sdp = -1;
/* IB SDP BSDH Header */
static int hf_ib_sdp_bsdh = -1;
static int hf_ib_sdp_mid = -1;
@ -222,7 +220,7 @@ manual_override:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDP");
SDP_header_item = proto_tree_add_item(tree, hf_ib_sdp, tvb, local_offset, -1, ENC_NA);
SDP_header_item = proto_tree_add_item(tree, proto_ib_sdp, tvb, local_offset, -1, ENC_NA);
SDP_header_tree = proto_item_add_subtree(SDP_header_item, ett_ib_sdp);
SDP_BSDH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_bsdh, tvb, local_offset, 16, ENC_NA);
@ -321,10 +319,6 @@ proto_register_ib_sdp(void)
{
module_t *ib_sdp_module;
static hf_register_info hf[] = {
{ &hf_ib_sdp, {
"SDP", "infiniband_sdp",
FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}
},
/* SDP BSDH Header */
{ &hf_ib_sdp_bsdh, {
"BSDH", "infiniband_sdp.bsdh",

7
epan/dissectors/packet-iser.c
View File

@ -70,7 +70,6 @@ static dissector_handle_t ib_handler;
static int proto_ib = -1;
/* iSER Header */
static int hf_iser = -1;
static int hf_iser_flags = -1;
static int hf_iser_opcode_f = -1;
static int hf_iser_RSV_f = -1;
@ -183,7 +182,7 @@ static int dissect_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
/* create display subtree for the protocol */
ti = proto_tree_add_item(tree, hf_iser, tvb, 0, ISER_HDR_SZ, ENC_NA);
ti = proto_tree_add_item(tree, proto_iser, tvb, 0, ISER_HDR_SZ, ENC_NA);
iser_tree = proto_item_add_subtree(ti, ett_iser);
@ -291,10 +290,6 @@ proto_register_iser(void)
{
module_t *iser_module;
static hf_register_info hf[] = {
{ &hf_iser, {
"iSER", "iser",
FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}
},
{ &hf_iser_flags,
{ "Flags", "iser.flags",
FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}

8
epan/dissectors/packet-rpcrdma.c
View File

@ -60,7 +60,6 @@ static dissector_handle_t rpcordma_handler;
static int proto_ib = -1;
/* RPCoRDMA Header */
static int hf_rpcordma = -1;
static int hf_rpcordma_xid = -1;
static int hf_rpcordma_vers = -1;
static int hf_rpcordma_flow_control = -1;
@ -303,7 +302,7 @@ dissect_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
/* create display subtree for the protocol */
ti = proto_tree_add_item(tree, hf_rpcordma, tvb, 0, MIN_RPCRDMA_HDR_SZ, ENC_NA);
ti = proto_tree_add_item(tree, proto_rpcordma, tvb, 0, MIN_RPCRDMA_HDR_SZ, ENC_NA);
rpcordma_tree = proto_item_add_subtree(ti, ett_rpcordma);
@ -449,11 +448,6 @@ proto_register_rpcordma(void)
{
module_t *rpcordma_module;
static hf_register_info hf[] = {
{ &hf_rpcordma,
{ "RPCoRDMA", "rpcordma",
FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL}
},
{ &hf_rpcordma_xid,
{ "XID", "rpcordma.xid",
FT_UINT32, BASE_HEX,