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-selfm.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-selfm.c')
| -rw-r--r-- | epan/dissectors/packet-selfm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index a9d3587c2c..50afd4a1c4 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -251,6 +251,8 @@ static gint ett_selfm_fastmsg_element = -1; /* Expert fields */ static expert_field ei_selfm_crc16_incorrect = EI_INIT; +static dissector_handle_t selfm_handle; + #define PORT_SELFM 0 #define CMD_FAST_MSG 0xA546 @@ -2998,7 +3000,7 @@ proto_register_selfm(void) proto_selfm = proto_register_protocol("SEL Protocol", "SEL Protocol", "selfm"); /* Registering protocol to be called by another dissector */ - register_dissector("selfm", dissect_selfm_tcp, proto_selfm); + selfm_handle = register_dissector("selfm", dissect_selfm_tcp, proto_selfm); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_selfm, selfm_hf, array_length(selfm_hf)); @@ -3048,12 +3050,10 @@ void proto_reg_handoff_selfm(void) { static int selfm_prefs_initialized = FALSE; - static dissector_handle_t selfm_handle; static unsigned int selfm_port; /* Make sure to use SEL FM Protocol Preferences field to determine default TCP port */ if (! selfm_prefs_initialized) { - selfm_handle = create_dissector_handle(dissect_selfm_tcp, proto_selfm); selfm_prefs_initialized = TRUE; } else { |