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/file-file.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/file-file.c')
| -rw-r--r-- | epan/dissectors/file-file.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index 625a908e0c..5748057558 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -46,7 +46,6 @@ #include "file-file.h" void proto_register_file(void); -void proto_reg_handoff_file(void); static int proto_file = -1; static int hf_file_record_number = -1; @@ -64,8 +63,6 @@ static gint ett_file = -1; static int file_tap = -1; -static dissector_handle_t data_handle; - dissector_table_t file_encap_dissector_table; /* @@ -203,7 +200,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); col_add_fstr(pinfo->cinfo, COL_INFO, "FTAP_ENCAP = %d", pinfo->pkt_encap); - call_dissector(data_handle,tvb, pinfo, parent_tree); + call_data_dissector(tvb, pinfo, parent_tree); } #ifdef _MSC_VER } __except(EXCEPTION_EXECUTE_HANDLER /* handle all exceptions */) { @@ -420,12 +417,6 @@ proto_register_file(void) file_tap=register_tap("file"); } -void -proto_reg_handoff_file(void) -{ - data_handle = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |