diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-03-03 12:12:03 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-06 21:58:07 +0000 |
| commit | f4591ef55dfb6216394c0d60c149ece0ec70bbac (patch) | |
| tree | dcc04902a3be5d26b1e48c8c67994394abaf67fb /epan/dissectors/packet-btobex.c | |
| parent | 78ff87e655ee899a93c831581fcb005cb9ef955b (diff) | |
Bluetooth: Avoid using find_dissector()
Also remove SVN $Id$ lines.
Change-Id: I4f2925e6ad8dcfe4a62d879a2cef44447f8ae916
Reviewed-on: https://code.wireshark.org/review/476
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btobex.c')
| -rw-r--r-- | epan/dissectors/packet-btobex.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 0806725bfe..c9a3580272 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -204,6 +204,8 @@ static gint ett_btobex_fragments = -1; static expert_field ei_application_parameter_length_bad = EI_INIT; +static dissector_handle_t btobex_handle; + static reassembly_table btobex_reassembly_table; static const fragment_items btobex_frag_items = { @@ -2520,7 +2522,7 @@ proto_register_btobex(void) proto_btobex = proto_register_protocol("Bluetooth OBEX Protocol", "BT OBEX", "btobex"); - new_register_dissector("btobex", dissect_btobex, proto_btobex); + btobex_handle = new_register_dissector("btobex", dissect_btobex, proto_btobex); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_btobex, hf, array_length(hf)); @@ -2534,10 +2536,6 @@ proto_register_btobex(void) void proto_reg_handoff_btobex(void) { - dissector_handle_t btobex_handle; - - btobex_handle = find_dissector("btobex"); - /* register in rfcomm and l2cap the profiles/services this dissector should handle */ dissector_add_uint("btrfcomm.service", BTSDP_OPP_SERVICE_UUID, btobex_handle); dissector_add_uint("btrfcomm.service", BTSDP_FTP_SERVICE_UUID, btobex_handle); |