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-gsm_cbch.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-gsm_cbch.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_cbch.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c index fd8bd05d63..925fc124d7 100644 --- a/epan/dissectors/packet-gsm_cbch.c +++ b/epan/dissectors/packet-gsm_cbch.c @@ -98,7 +98,6 @@ static expert_field ei_gsm_cbch_seq_num_null = EI_INIT; static expert_field ei_gsm_cbch_seq_num_reserved = EI_INIT; static expert_field ei_gsm_cbch_lpd = EI_INIT; -static dissector_handle_t data_handle; static dissector_handle_t cbs_handle; /* reassembly of CHCH blocks */ @@ -439,12 +438,12 @@ dissect_cbch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U case 0x0F: expert_add_info(pinfo, seq_item, &ei_gsm_cbch_seq_num_null); - call_dissector(data_handle, tvb, pinfo, cbch_tree); + call_data_dissector(tvb, pinfo, cbch_tree); break; default: expert_add_info(pinfo, seq_item, &ei_gsm_cbch_seq_num_reserved); - call_dissector(data_handle, tvb, pinfo, cbch_tree); + call_data_dissector(tvb, pinfo, cbch_tree); break; } if (reass_tvb) @@ -471,7 +470,7 @@ dissect_cbch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U else { expert_add_info(pinfo, lpd_item, &ei_gsm_cbch_lpd); - call_dissector(data_handle, tvb, pinfo, cbch_tree); + call_data_dissector(tvb, pinfo, cbch_tree); } return tvb_captured_length(tvb); } @@ -656,7 +655,6 @@ proto_register_gsm_cbch(void) void proto_reg_handoff_gsm_cbch(void) { - data_handle = find_dissector("data"); cbs_handle = find_dissector_add_dependency("gsm_cbs", proto_cbch); } |