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-rpcrdma.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-rpcrdma.c')
| -rw-r--r-- | epan/dissectors/packet-rpcrdma.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c index b26f8910bd..51e7b9e891 100644 --- a/epan/dissectors/packet-rpcrdma.c +++ b/epan/dissectors/packet-rpcrdma.c @@ -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, |