diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-10-09 10:36:04 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-10-09 10:36:04 +0000 |
commit | 3805f354a4aad2ac032699a55a13ed9df6a5b684 (patch) | |
tree | c35573762e32854261581430f00946dbc5f97522 /epan/dissectors | |
parent | 4209300f48774c7322a36e2673d396da6c237eaf (diff) |
From Michal Labedzki:
[PATCH 15] Bluetooth: Add modelines
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=45422
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-btamp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-btavctp.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btavctp.h | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btavrcp.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btbnep.c | 17 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_acl.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_acl.h | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_evt.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_sco.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthfp.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthid.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 17 | ||||
-rw-r--r-- | epan/dissectors/packet-btl2cap.h | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btobex.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btrfcomm.h | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-btsdp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-btsdp.h | 13 |
19 files changed, 243 insertions, 8 deletions
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 9a5dc7a013..69d68bb0e7 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -657,3 +657,15 @@ proto_reg_handoff_btamp(void) dissector_add_uint("btl2cap.cid", BTL2CAP_FIXED_CID_AMP_MAN, btamp_handle); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index e89714e482..a9f69b3423 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -364,3 +364,16 @@ proto_reg_handoff_btavctp(void) dissector_add_handle("btl2cap.cid", btavctp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btavctp.h b/epan/dissectors/packet-btavctp.h index bcf8b03001..1a25b66e69 100644 --- a/epan/dissectors/packet-btavctp.h +++ b/epan/dissectors/packet-btavctp.h @@ -33,3 +33,16 @@ typedef struct _btavctp_data_t { } btavctp_data_t; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 8fc6494701..d6db6ea9a2 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -2986,3 +2986,16 @@ proto_reg_handoff_btavrcp(void) { } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 024c2697c5..16511c572c 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -358,8 +358,8 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (bnep_type != BNEP_TYPE_CONTROL) { type = tvb_get_ntohs(tvb, offset); if (!top_dissect) { - proto_tree_add_item(btbnep_tree, hf_btbnep_type, tvb, offset, 2, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, " - Type: %s", val_to_str(type, etype_vals, "unknown")); + proto_tree_add_item(btbnep_tree, hf_btbnep_type, tvb, offset, 2, ENC_BIG_ENDIAN); + col_append_fstr(pinfo->cinfo, COL_INFO, " - Type: %s", val_to_str(type, etype_vals, "unknown")); } offset += 2; } else { @@ -551,3 +551,16 @@ proto_reg_handoff_btbnep(void) dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_BNEP, btbnep_handle); dissector_add_handle("btl2cap.cid", btbnep_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index b4ed99bed1..b382d4b9c8 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -300,4 +300,15 @@ proto_reg_handoff_bthci_acl(void) btl2cap_handle = find_dissector("btl2cap"); } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthci_acl.h b/epan/dissectors/packet-bthci_acl.h index b9eb2412ae..f945fe2f54 100644 --- a/epan/dissectors/packet-bthci_acl.h +++ b/epan/dissectors/packet-bthci_acl.h @@ -29,3 +29,16 @@ typedef struct _bthci_acl_data_t { } bthci_acl_data_t; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 545183fbdb..49bb49e693 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -2925,3 +2925,15 @@ proto_reg_handoff_bthci_cmd(void) dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_COMMAND, bthci_cmd_handle); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 74a51acfca..9d3aa878fe 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -3603,4 +3603,15 @@ proto_reg_handoff_bthci_evt(void) bthci_com_handle = find_dissector("bthci_cmd"); } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index f64f2a53b0..f683d739db 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -110,4 +110,15 @@ proto_reg_handoff_bthci_sco(void) dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_SCO, bthci_sco_handle); } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 39ca9e41ea..5881907d96 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -94,3 +94,16 @@ proto_reg_handoff_bthfp(void) dissector_add_uint("btrfcomm.service", BTSDP_HFP_GW_SERVICE_UUID, bthfp_handle); dissector_add_handle("btrfcomm.channel", bthfp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index d1ab669457..da275f0ec4 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -1090,3 +1090,16 @@ proto_reg_handoff_bthid(void) dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_HID_INTR, bthid_handle); dissector_add_handle("btl2cap.cid", bthid_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 224fcfa52c..6fe26d9976 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1038,7 +1038,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree if (length <= 6) { expert_add_info_format(pinfo, pi, PI_MALFORMED, PI_WARN, "SDU length too short: %u", length); - THROW(ReportedBoundsError); + THROW(ReportedBoundsError); } length -= 6; /*Control, SDUlength, FCS*/ @@ -1071,7 +1071,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree if (length <= 4) { expert_add_info_format(pinfo, btl2cap_tree, PI_MALFORMED, PI_WARN, "Control / FCS length too short: %u", length); - THROW(ReportedBoundsError); + THROW(ReportedBoundsError); } length -= 4; /*Control, FCS*/ } @@ -1908,3 +1908,16 @@ proto_reg_handoff_btl2cap(void) using the PSM channel so we know which sub-dissector to call */ register_tap_listener("btsdp", NULL, NULL, TL_IS_DISSECTOR_HELPER, NULL, btl2cap_sdp_tap_packet, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h index a439137751..0cced175fa 100644 --- a/epan/dissectors/packet-btl2cap.h +++ b/epan/dissectors/packet-btl2cap.h @@ -53,3 +53,16 @@ typedef struct _btl2cap_data_t { } btl2cap_data_t; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 965adc6cb9..020977aa8f 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -778,3 +778,15 @@ proto_reg_handoff_btobex(void) data_handle = find_dissector("data"); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 5b26bb176a..c98ca7cc7d 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -1153,4 +1153,15 @@ proto_reg_handoff_btspp(void) dissector_add_handle("btrfcomm.channel", btspp_handle); } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btrfcomm.h b/epan/dissectors/packet-btrfcomm.h index f31cd87847..f3468358b3 100644 --- a/epan/dissectors/packet-btrfcomm.h +++ b/epan/dissectors/packet-btrfcomm.h @@ -35,3 +35,16 @@ typedef struct _btrfcomm_data_t { } btrfcomm_data_t; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 2cba2f174b..f7e76eee9c 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -1105,3 +1105,15 @@ proto_reg_handoff_btsdp(void) dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_SDP, btsdp_handle); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-btsdp.h b/epan/dissectors/packet-btsdp.h index caf7071350..9d60a8d116 100644 --- a/epan/dissectors/packet-btsdp.h +++ b/epan/dissectors/packet-btsdp.h @@ -167,3 +167,16 @@ typedef struct _btsdp_data_t { extern value_string_ext vs_service_classes_ext; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |