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-iser.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-iser.c')
| -rw-r--r-- | epan/dissectors/packet-iser.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index 5dc88df529..9e577e9082 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -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} |