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-jxta.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-jxta.c')
-rw-r--r-- | epan/dissectors/packet-jxta.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 15ae9aa580..9382446e6d 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -74,7 +74,6 @@ static int jxta_tap = -1; static dissector_table_t media_type_dissector_table = NULL; static dissector_handle_t media_handle = NULL; -static dissector_handle_t data_handle = NULL; static dissector_handle_t stream_jxta_handle = NULL; static dissector_handle_t ssl_handle = NULL; @@ -2111,7 +2110,7 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf if(0 == dissected) { /* display it as raw data */ - dissected = call_dissector(data_handle, tvb, pinfo, tree); + dissected = call_data_dissector(tvb, pinfo, tree); } return dissected; @@ -2402,7 +2401,6 @@ void proto_reg_handoff_jxta(void) media_type_dissector_table = find_dissector_table("media_type"); ssl_handle = find_dissector_add_dependency("ssl", proto_jxta); - data_handle = find_dissector("data"); media_handle = find_dissector_add_dependency("media", proto_jxta); init_done = TRUE; |