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-cfdp.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-cfdp.c')
| -rw-r--r-- | epan/dissectors/packet-cfdp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c index 1c08c6309f..bc26a27417 100644 --- a/epan/dissectors/packet-cfdp.c +++ b/epan/dissectors/packet-cfdp.c @@ -127,6 +127,7 @@ static gint ett_cfdp_flow_label = -1; static expert_field ei_cfdp_bad_length = EI_INIT; +static dissector_handle_t cfdp_handle; /* Generic data handle */ static dissector_handle_t data_handle; @@ -1625,17 +1626,14 @@ proto_register_cfdp(void) expert_cfdp = expert_register_protocol(proto_cfdp); expert_register_field_array(expert_cfdp, ei, array_length(ei)); - register_dissector ( "cfdp", dissect_cfdp, proto_cfdp ); + cfdp_handle = register_dissector("cfdp", dissect_cfdp, proto_cfdp); } void proto_reg_handoff_cfdp(void) { - static dissector_handle_t cfdp_handle; - - cfdp_handle = create_dissector_handle(dissect_cfdp, proto_cfdp); dissector_add_uint("ccsds.apid", CFDP_APID, cfdp_handle); - dissector_add_for_decode_as ( "udp.port", cfdp_handle ); + dissector_add_for_decode_as("udp.port", cfdp_handle); data_handle = find_dissector("data"); } |