diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-02-21 14:24:11 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-22 13:32:01 +0000 |
| commit | d1f5b376fa1309fc1fed66ee5a8cad0b9ad5d7aa (patch) | |
| tree | 23d52cf75f3874e33c73bf2c7959279088f54b46 /epan/dissectors/packet-infiniband_sdp.c | |
| parent | 7e55f4102cd91497713daabff10f2acd006e7299 (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-infiniband_sdp.c')
| -rw-r--r-- | epan/dissectors/packet-infiniband_sdp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index 014e0ea970..ecf6018894 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -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", |