diff options
Diffstat (limited to 'epan/dissectors/packet-etv.c')
| -rw-r--r-- | epan/dissectors/packet-etv.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index 22fbfa4a..89cb3520 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -22,29 +22,29 @@ void proto_reg_handoff_etv(void); static dissector_handle_t etv_dii_handle; static dissector_handle_t etv_ddb_handle; -static int proto_etv_dii = -1; -static int proto_etv_ddb = -1; +static int proto_etv_dii; +static int proto_etv_ddb; static dissector_handle_t dsmcc_handle; -static int hf_etv_dii_filter_info = -1; -static int hf_etv_dii_reserved = -1; +static int hf_etv_dii_filter_info; +static int hf_etv_dii_reserved; -static expert_field ei_etv_dii_invalid_section_syntax_indicator = EI_INIT; -static expert_field ei_etv_dii_invalid_section_length = EI_INIT; -static expert_field ei_etv_dii_invalid_reserved_bits = EI_INIT; -static expert_field ei_etv_dii_filter_info = EI_INIT; +static expert_field ei_etv_dii_invalid_section_syntax_indicator; +static expert_field ei_etv_dii_invalid_section_length; +static expert_field ei_etv_dii_invalid_reserved_bits; +static expert_field ei_etv_dii_filter_info; -static int hf_etv_ddb_filter_info = -1; -static int hf_etv_ddb_reserved = -1; +static int hf_etv_ddb_filter_info; +static int hf_etv_ddb_reserved; -static expert_field ei_etv_ddb_invalid_section_syntax_indicator = EI_INIT; -static expert_field ei_etv_ddb_invalid_section_length = EI_INIT; -static expert_field ei_etv_ddb_invalid_reserved_bits = EI_INIT; -static expert_field ei_etv_ddb_filter_info = EI_INIT; +static expert_field ei_etv_ddb_invalid_section_syntax_indicator; +static expert_field ei_etv_ddb_invalid_section_length; +static expert_field ei_etv_ddb_invalid_reserved_bits; +static expert_field ei_etv_ddb_filter_info; -static gint ett_etv = -1; -static gint ett_etv_payload = -1; +static int ett_etv; +static int ett_etv_payload; static void dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int proto, @@ -53,16 +53,16 @@ dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int prot expert_field* ei_section_length, expert_field* ei_filter_info) { tvbuff_t *sub_tvb; - guint offset = 0; + unsigned offset = 0; proto_item *ti; proto_item *pi; proto_tree *etv_tree; proto_item *items[PACKET_MPEG_SECT_PI__SIZE]; - gboolean ssi; - guint reserved; - guint8 reserved2; - guint16 filter_info; - guint sect_len; + bool ssi; + unsigned reserved; + uint8_t reserved2; + uint16_t filter_info; + unsigned sect_len; ti = proto_tree_add_item(tree, proto, tvb, offset, -1, ENC_NA); etv_tree = proto_item_add_subtree(ti, ett_etv); @@ -70,7 +70,7 @@ dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int prot offset += packet_mpeg_sect_header_extra(tvb, offset, etv_tree, §_len, &reserved, &ssi, items); - if (FALSE != ssi) { + if (false != ssi) { proto_item *msg_error; msg_error = items[PACKET_MPEG_SECT_PI__SSI]; @@ -111,7 +111,7 @@ dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int prot } offset += 2; - reserved2 = tvb_get_guint8(tvb, offset); + reserved2 = tvb_get_uint8(tvb, offset); pi = proto_tree_add_item(etv_tree, hf_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if (0 != reserved2) { expert_add_info_format(pinfo, pi, ei_reserved, @@ -182,7 +182,7 @@ proto_register_etv(void) } } }; - static gint *ett[] = { + static int *ett[] = { &ett_etv, &ett_etv_payload }; |