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-nwp.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-nwp.c')
| -rw-r--r-- | epan/dissectors/packet-nwp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nwp.c b/epan/dissectors/packet-nwp.c index 846b48d3cd..1971b2d51f 100644 --- a/epan/dissectors/packet-nwp.c +++ b/epan/dissectors/packet-nwp.c @@ -60,6 +60,8 @@ static gint ett_nwp_neigh_tree = -1; static expert_field ei_nwp_bad_type = EI_INIT; +static dissector_handle_t nwp_handle; + #define NWP_XID_CHUNK_LEN 4 #define NWP_XID_LEN 20 /* Two characters for every byte + 4 for "hid-" + 1 for "\0" */ @@ -345,7 +347,7 @@ proto_register_nwp(void) "NWP", "nwp"); - register_dissector("nwp", dissect_nwp, proto_nwp); + nwp_handle = register_dissector("nwp", dissect_nwp, proto_nwp); proto_register_field_array(proto_nwp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -356,8 +358,6 @@ proto_register_nwp(void) void proto_reg_handoff_nwp(void) { - dissector_handle_t nwp_handle; - nwp_handle = create_dissector_handle(dissect_nwp, proto_nwp); dissector_add_uint("ethertype", ETHERTYPE_NWP, nwp_handle); } |