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-cbor.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-cbor.c')
| -rw-r--r-- | epan/dissectors/packet-cbor.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c index 92b07c071d..1d32b06706 100644 --- a/epan/dissectors/packet-cbor.c +++ b/epan/dissectors/packet-cbor.c @@ -71,6 +71,8 @@ static expert_field ei_cbor_invalid_minor_type = EI_INIT; static expert_field ei_cbor_invalid_element = EI_INIT; static expert_field ei_cbor_too_long_length = EI_INIT; +static dissector_handle_t cbor_handle; + #define CBOR_TYPE_USIGNED_INT 0 #define CBOR_TYPE_NEGATIVE_INT 1 #define CBOR_TYPE_BYTE_STRING 2 @@ -853,15 +855,12 @@ proto_register_cbor(void) expert_cbor = expert_register_protocol(proto_cbor); expert_register_field_array(expert_cbor, ei, array_length(ei)); - register_dissector("cbor", dissect_cbor, proto_cbor); + cbor_handle = register_dissector("cbor", dissect_cbor, proto_cbor); } void proto_reg_handoff_cbor(void) { - static dissector_handle_t cbor_handle; - - cbor_handle = create_dissector_handle(dissect_cbor, proto_cbor); dissector_add_string("media_type", "application/cbor", cbor_handle); /* RFC 7049 */ } |