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-btavdtp.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-btavdtp.c')
| -rw-r--r-- | epan/dissectors/packet-btavdtp.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index ffa136050e..c082f2d0f7 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -2056,7 +2056,7 @@ proto_register_btavdtp(void) }; proto_btavdtp = proto_register_protocol("Bluetooth AVDTP Protocol", "BT AVDTP", "btavdtp"); - new_register_dissector("btavdtp", dissect_btavdtp, proto_btavdtp); + btavdtp_handle = new_register_dissector("btavdtp", dissect_btavdtp, proto_btavdtp); proto_register_field_array(proto_btavdtp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -2079,10 +2079,6 @@ proto_register_btavdtp(void) void proto_reg_handoff_btavdtp(void) { - btavdtp_handle = find_dissector("btavdtp"); - bta2dp_handle = find_dissector("bta2dp"); - btvdp_handle = find_dissector("btvdp"); - dissector_add_uint("btl2cap.service", BTSDP_AVDTP_PROTOCOL_UUID, btavdtp_handle); dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_AVDTP, btavdtp_handle); @@ -2207,7 +2203,7 @@ proto_register_bta2dp(void) proto_register_field_array(proto_bta2dp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - new_register_dissector("bta2dp", dissect_bta2dp, proto_bta2dp); + bta2dp_handle = new_register_dissector("bta2dp", dissect_bta2dp, proto_bta2dp); module = prefs_register_protocol(proto_bta2dp, NULL); prefs_register_static_text_preference(module, "a2dp.version", @@ -2234,7 +2230,6 @@ proto_reg_handoff_bta2dp(void) /* TODO: ATRAC dissector does not exist yet */ atrac_handle = find_dissector("atrac"); - bta2dp_handle = find_dissector("bta2dp"); rtp_handle = find_dissector("rtp"); dissector_add_uint("btl2cap.service", BTSDP_A2DP_SOURCE_SERVICE_UUID, bta2dp_handle); @@ -2359,7 +2354,7 @@ proto_register_btvdp(void) }; proto_btvdp = proto_register_protocol("Bluetooth VDP Profile", "BT VDP", "btvdp"); - new_register_dissector("btvdp", dissect_btvdp, proto_btvdp); + btvdp_handle = new_register_dissector("btvdp", dissect_btvdp, proto_btvdp); proto_register_field_array(proto_bta2dp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_btavdtp = expert_register_protocol(proto_btvdp); @@ -2388,7 +2383,6 @@ proto_reg_handoff_btvdp(void) mp4v_es_handle = find_dissector("mp4v-es"); rtp_handle = find_dissector("rtp"); - btvdp_handle = find_dissector("btvdp"); dissector_add_uint("btl2cap.service", BTSDP_VDP_SOURCE_SERVICE_UUID, btvdp_handle); dissector_add_uint("btl2cap.service", BTSDP_VDP_SINK_SERVICE_UUID, btvdp_handle); |