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-flexray.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-flexray.c')
| -rw-r--r-- | epan/dissectors/packet-flexray.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-flexray.c b/epan/dissectors/packet-flexray.c index 98f22418d9..937fbfa4fe 100644 --- a/epan/dissectors/packet-flexray.c +++ b/epan/dissectors/packet-flexray.c @@ -82,7 +82,6 @@ static expert_field ei_flexray_symbol_frame = EI_INIT; static expert_field ei_flexray_error_flag = EI_INIT; static expert_field ei_flexray_stfi_flag = EI_INIT; -static dissector_handle_t data_handle; static dissector_table_t subdissector_table; #define FLEXRAY_FRAME 0x01 @@ -252,11 +251,11 @@ dissect_flexray(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (call_subdissector) { if (!dissector_try_uint_new(subdissector_table, 0, next_tvb, pinfo, tree, FALSE, &flexray_id)) { - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } } else { - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } } } @@ -471,8 +470,6 @@ proto_reg_handoff_flexray(void) flexray_handle = create_dissector_handle( dissect_flexray, proto_flexray ); dissector_add_uint("wtap_encap", WTAP_ENCAP_FLEXRAY, flexray_handle); - - data_handle = find_dissector("data"); } /* |