diff options
Diffstat (limited to 'epan/dissectors/packet-hci_h1.c')
| -rw-r--r-- | epan/dissectors/packet-hci_h1.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index f0cd09ee..e616b1e2 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -15,11 +15,11 @@ #include "packet-bluetooth.h" -static int proto_hci_h1 = -1; +static int proto_hci_h1; -static int hf_hci_h1_direction = -1; +static int hf_hci_h1_direction; -static gint ett_hci_h1 = -1; +static int ett_hci_h1; static dissector_table_t hci_h1_table; @@ -43,10 +43,10 @@ static const value_string hci_h1_direction_vals[] = { void proto_register_hci_h1(void); void proto_reg_handoff_hci_h1(void); -static gint +static int dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - guint8 type; + uint8_t type; tvbuff_t *next_tvb; proto_item *ti = NULL; proto_tree *hci_h1_tree = NULL; @@ -88,7 +88,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) val_to_str(type, hci_h1_type_vals, "Unknown 0x%02x")); else - col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, hci_h1_type_vals, "Unknown 0x%02x")); @@ -96,7 +96,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_item_set_generated(ti); next_tvb = tvb_new_subset_remaining(tvb, 0); - if (!dissector_try_uint_new(hci_h1_table, type, next_tvb, pinfo, tree, TRUE, bluetooth_data)) { + if (!dissector_try_uint_new(hci_h1_table, type, next_tvb, pinfo, tree, true, bluetooth_data)) { call_data_dissector(next_tvb, pinfo, tree); } @@ -115,7 +115,7 @@ proto_register_hci_h1(void) } }; - static gint *ett[] = { + static int *ett[] = { &ett_hci_h1, }; |