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-xip.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-xip.c')
| -rw-r--r-- | epan/dissectors/packet-xip.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-xip.c b/epan/dissectors/packet-xip.c index c11e2fe9b6..538b9d1dec 100644 --- a/epan/dissectors/packet-xip.c +++ b/epan/dissectors/packet-xip.c @@ -69,6 +69,8 @@ static expert_field ei_xip_next_header = EI_INIT; static expert_field ei_xip_bad_num_dst = EI_INIT; static expert_field ei_xip_bad_num_src = EI_INIT; +static dissector_handle_t xip_handle; + /* XIA principals. */ #define XIDTYPE_NAT 0x00 #define XIDTYPE_AD 0x10 @@ -681,9 +683,9 @@ proto_register_xip(void) proto_xip = proto_register_protocol( "eXpressive Internet Protocol", "XIP", - "xip"); + "xip"); - register_dissector("xip", dissect_xip, proto_xip); + xip_handle = register_dissector("xip", dissect_xip, proto_xip); proto_register_field_array(proto_xip, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -694,9 +696,6 @@ proto_register_xip(void) void proto_reg_handoff_xip(void) { - dissector_handle_t xip_handle; - - xip_handle = create_dissector_handle(dissect_xip, proto_xip); dissector_add_uint("ethertype", ETHERTYPE_XIP, xip_handle); xip_serval_handle = find_dissector("xipserval"); |