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-fcct.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-fcct.c')
| -rw-r--r-- | epan/dissectors/packet-fcct.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 4adeb16f97..5a5cc8526a 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -90,7 +90,6 @@ const value_string fc_ct_gsserver_vals[] = { }; static dissector_table_t fcct_gserver_table; -static dissector_handle_t data_handle; guint8 get_gs_server (guint8 gstype, guint8 gssubtype) @@ -211,7 +210,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) next_tvb = tvb_new_subset_remaining (tvb, 0); if (!dissector_try_uint_new(fcct_gserver_table, server, next_tvb, pinfo, tree, TRUE, data)) { - call_dissector (data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } return tvb_captured_length(tvb); @@ -286,8 +285,6 @@ proto_reg_handoff_fcct (void) fcct_handle = create_dissector_handle (dissect_fcct, proto_fcct); dissector_add_uint("fc.ftype", FC_FTYPE_FCCT, fcct_handle); - - data_handle = find_dissector ("data"); } /* |