diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
| commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
| tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-fc.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 0dd06499a1..5f372efff1 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -145,8 +145,6 @@ static expert_field ei_frag_size = EI_INIT; static dissector_handle_t fc_handle, fcsof_handle; static dissector_table_t fcftype_dissector_table; -static dissector_handle_t data_handle; - static int fc_tap = -1; typedef struct _fc_conv_data_t { @@ -1141,7 +1139,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean tvb, offset+9, 1, 0); PROTO_ITEM_SET_HIDDEN(hidden_item); next_tvb = tvb_new_subset_remaining (tvb, next_offset); - call_dissector (data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); return; } } @@ -1156,11 +1154,11 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean /* If relative offset is used, only dissect the pdu with * offset 0 (param) */ if( (fchdr->fctl&FC_FCTL_REL_OFFSET) && param ){ - call_dissector (data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } else { if (!dissector_try_uint_new (fcftype_dissector_table, ftype, next_tvb, pinfo, tree, FALSE, fchdr)) { - call_dissector (data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } } } else if (ftype == FC_FTYPE_BLS) { @@ -1622,8 +1620,6 @@ proto_reg_handoff_fc (void) create_dissector_handle(dissect_fc_wtap, proto_fc)); dissector_add_uint("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS, fcsof_handle); - - data_handle = find_dissector("data"); } /* |