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-ocfs2.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-ocfs2.c')
| -rw-r--r-- | epan/dissectors/packet-ocfs2.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c index a0540bf9e9..22f196555b 100644 --- a/epan/dissectors/packet-ocfs2.c +++ b/epan/dissectors/packet-ocfs2.c @@ -132,8 +132,6 @@ static int hf_dlm_pad32 = -1; static int hf_dlm_flags = -1; static int hf_dlm_payload = -1; -static dissector_handle_t data_handle; - #define O2NM_MAX_NAME_LEN 64 #define O2NM_NODE_MAP_IN_BYTES 32 @@ -1137,7 +1135,7 @@ static int dissect_ocfs2_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } } else { next_tvb = tvb_new_subset_length(tvb, offset, len); - call_dissector( data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } return tvb_reported_length(tvb); @@ -1658,9 +1656,6 @@ void proto_reg_handoff_ocfs2(void) ocfs2_handle = create_dissector_handle(dissect_ocfs2, proto_ocfs2); dissector_add_for_decode_as("tcp.port", ocfs2_handle); - - /* Find dissector for data packet */ - data_handle = find_dissector("data"); } |