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-ax25-nol3.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-ax25-nol3.c')
| -rw-r--r-- | epan/dissectors/packet-ax25-nol3.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c index 5efb3b0090..d825d72b53 100644 --- a/epan/dissectors/packet-ax25-nol3.c +++ b/epan/dissectors/packet-ax25-nol3.c @@ -57,7 +57,6 @@ void proto_reg_handoff_ax25_nol3(void); /* Dissector handles - all the possibles are listed */ static dissector_handle_t aprs_handle; -static dissector_handle_t default_handle; /* Initialize the protocol and registered fields */ static int proto_ax25_nol3 = -1; @@ -212,7 +211,7 @@ dissect_ax25_nol3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo } } if ( ! dissected ) - call_dissector( default_handle , next_tvb, pinfo, ax25_nol3_tree ); + call_data_dissector(next_tvb, pinfo, ax25_nol3_tree ); return tvb_captured_length(tvb); } @@ -289,8 +288,6 @@ proto_reg_handoff_ax25_nol3(void) /* */ aprs_handle = find_dissector_add_dependency( "aprs", proto_ax25_nol3 ); - default_handle = find_dissector( "data" ); - } /* |