diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-01-13 02:16:04 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-01-13 11:36:29 +0000 |
| commit | bf0f5a982bc0666b6fa8d70c8d64cb1f07ab12ad (patch) | |
| tree | 1a6adb34aa0b0b7b59e5f1f2fedfda9014e9769d /epan/dissectors/packet-peekremote.c | |
| parent | 4f4769adf626ec2601e3488efbc2e2d57d55762c (diff) | |
Use result of register_dissector
Assign result of `register_dissector(..., func, proto)` to FOO_handle
and remove `FOO_handle = create_dissector_handle(func, proto)`.
Found by looking for files named packet-FOO.c having the above
create_dissector_handle pattern. Some files (with different dissect
routines for the two functions) remain unchanged.
Change-Id: Ifbed8202c6dbc63a1dae9acc03313980ffbbbb90
Reviewed-on: https://code.wireshark.org/review/13247
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-peekremote.c')
| -rw-r--r-- | epan/dissectors/packet-peekremote.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index 8b343e4b22..36e988125d 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -65,6 +65,7 @@ void proto_register_peekremote(void); void proto_reg_handoff_peekremote(void); static int proto_peekremote; +static dissector_handle_t peekremote_handle; /* * XXX - we don't have all the MCS index values here. @@ -679,17 +680,14 @@ proto_register_peekremote(void) expert_peekremote = expert_register_protocol(proto_peekremote); expert_register_field_array(expert_peekremote, ei, array_length(ei)); - register_dissector("peekremote", dissect_peekremote_legacy, proto_peekremote); + peekremote_handle = register_dissector("peekremote", dissect_peekremote_legacy, proto_peekremote); } void proto_reg_handoff_peekremote(void) { - dissector_handle_t peekremote_handle; - wlan_radio_handle = find_dissector("wlan_radio"); - peekremote_handle = create_dissector_handle(dissect_peekremote_legacy, proto_peekremote); dissector_add_uint("udp.port", 5000, peekremote_handle); heur_dissector_add("udp", dissect_peekremote_new, "OmniPeek Remote over UDP", "peekremote_udp", proto_peekremote, HEURISTIC_ENABLE); |