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-common.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-common.c')
| -rw-r--r-- | epan/dissectors/packet-pw-common.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index e1b1a0e071..deb68fd7ed 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.c @@ -87,7 +87,6 @@ void pwc_item_append_text_n_items(proto_item* item, const int n, const char * co static gint proto_pw_padding = -1; static gint ett = -1; static int hf_padding_len = -1; -static dissector_handle_t dh_data; static int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) @@ -100,7 +99,7 @@ int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, v pwc_item_append_text_n_items(item,size,"byte"); tree_p = proto_item_add_subtree(item, ett); - call_dissector(dh_data, tvb, pinfo, tree_p); + call_data_dissector(tvb, pinfo, tree_p); item = proto_tree_add_int(tree_p, hf_padding_len, tvb, 0, 0, size); PROTO_ITEM_SET_HIDDEN(item); /*allow filtering*/ @@ -124,11 +123,6 @@ void proto_register_pw_padding(void) } -void proto_reg_handoff_pw_padding(void) -{ - dh_data = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |