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-wsmp.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-wsmp.c')
-rw-r--r-- | epan/dissectors/packet-wsmp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index 18975569b5..8a06357e7e 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -47,8 +47,6 @@ static const value_string wsmp_elemenid_names[] = { }; -static dissector_handle_t data_handle; - /* Initialize the protocol and registered fields */ static int proto_wsmp = -1; static int hf_wsmp_version = -1; @@ -194,7 +192,7 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ */ if (psid == 0xbff0) { - call_dissector(data_handle, wsmdata_tvb, pinfo, wsmdata_tree); + call_data_dissector(wsmdata_tvb, pinfo, wsmdata_tree); } return tvb_captured_length(tvb); } @@ -258,8 +256,6 @@ proto_reg_handoff_wsmp(void) wsmp_handle = create_dissector_handle(dissect_wsmp, proto_wsmp); dissector_add_uint("ethertype", ETHERTYPE_WSMP, wsmp_handle); - data_handle = find_dissector("data"); - return; } /* |