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-pw-atm.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-pw-atm.c')
-rw-r--r-- | epan/dissectors/packet-pw-atm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 39a3de9e1a..93e4ab7956 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -125,7 +125,6 @@ static dissector_handle_t dh_atm_truncated; static dissector_handle_t dh_atm_untruncated; static dissector_handle_t dh_atm_oam_cell; static dissector_handle_t dh_padding; -static dissector_handle_t dh_data; #define PTI_IS_ADMIN(pti) ((pti) == 4 || (pti) == 5 || (pti) == 6) /*see atm_pt_vals[]*/ @@ -1615,7 +1614,7 @@ dissect_cell(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * data tvbuff_t* tvb_d; tree2 = proto_item_add_subtree(item, ett_cell); tvb_d = tvb_new_subset(tvb, 0, dissect_size, -1); - call_dissector(dh_data, tvb_d, pinfo, tree2); + call_data_dissector(tvb_d, pinfo, tree2); item = proto_tree_add_int(tree2, hf_cell_payload_len, tvb, 0, 0, dissect_size); PROTO_ITEM_SET_HIDDEN(item); } @@ -1965,7 +1964,6 @@ proto_reg_handoff_pw_atm_ata(void) dh_atm_untruncated = find_dissector("atm_pw_untruncated"); dh_atm_oam_cell = find_dissector("atm_pw_oam_cell"); dh_padding = find_dissector("pw_padding"); - dh_data = find_dissector("data"); } /* |