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-xip.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-xip.c')
-rw-r--r-- | epan/dissectors/packet-xip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-xip.c b/epan/dissectors/packet-xip.c index f7fb208abc..8483c66a48 100644 --- a/epan/dissectors/packet-xip.c +++ b/epan/dissectors/packet-xip.c @@ -43,7 +43,6 @@ void proto_register_xip(void); void proto_reg_handoff_xip(void); /* Next dissector handles. */ -static dissector_handle_t data_handle; static dissector_handle_t xip_serval_handle; static gint proto_xip = -1; @@ -484,7 +483,7 @@ dissect_xip_next_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (next_header) { case XIA_NEXT_HEADER_DATA: next_tvb = tvb_new_subset_remaining(tvb, offset); - return call_dissector(data_handle, next_tvb, pinfo, tree); + return call_data_dissector(next_tvb, pinfo, tree); default: expert_add_info_format(pinfo, next_ti, &ei_xip_next_header, "Unrecognized next header type: 0x%02x", next_header); @@ -699,7 +698,6 @@ proto_reg_handoff_xip(void) dissector_add_uint("ethertype", ETHERTYPE_XIP, xip_handle); xip_serval_handle = find_dissector_add_dependency("xipserval", proto_xip); - data_handle = find_dissector("data"); } /* |