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-gmr1_rach.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-gmr1_rach.c')
| -rw-r--r-- | epan/dissectors/packet-gmr1_rach.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index 7f0dfcc0f7..5e7dff7d35 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -37,7 +37,6 @@ void proto_register_gmr1_rach(void); -void proto_reg_handoff_gmr1_rach(void); /* GMR-1 RACH proto */ static int proto_gmr1_rach = -1; @@ -53,9 +52,6 @@ static gint ett_rach_dialed_num = -1; static gint ett_rach_gps_pos = -1; static gint ett_rach_gmprs_req_type = -1; -/* Handoffs */ -static dissector_handle_t data_handle; - /* Fields */ static int hf_rach_prio = -1; static int hf_rach_est_cause = -1; @@ -915,7 +911,7 @@ dissect_gmr1_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat if (!ies) { col_append_str(pinfo->cinfo, COL_INFO, "(Invalid)"); - call_dissector(data_handle, tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); return tvb_captured_length(tvb); } @@ -1188,12 +1184,6 @@ proto_register_gmr1_rach(void) register_dissector("gmr1_rach", dissect_gmr1_rach, proto_gmr1_rach); } -void -proto_reg_handoff_gmr1_rach(void) -{ - data_handle = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |