From 77376a2363be6fda0576876db550acfe412dd223 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Thu, 14 Mar 2013 14:42:12 +0000 Subject: Change "4 space tabs" indentation to use "4 spaces" indentation. Also: - remove some unneeded initializers; - remove several unneeded 'col_clear()' calls; - guint8 --> guint to prevent a possible overflow; - reformat for style in some cases. svn path=/trunk/; revision=48297 --- epan/dissectors/packet-mpeg-pat.c | 195 +++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 98 deletions(-) (limited to 'epan/dissectors/packet-mpeg-pat.c') diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index c8f66f8ae3..80cfa48275 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -47,18 +47,18 @@ static int hf_mpeg_pat_program_map_pid = -1; static gint ett_mpeg_pat = -1; static gint ett_mpeg_pat_prog = -1; -#define MPEG_PAT_TID 0x00 +#define MPEG_PAT_TID 0x00 -#define MPEG_PAT_RESERVED_MASK 0xC0 -#define MPEG_PAT_VERSION_NUMBER_MASK 0x3E -#define MPEG_PAT_CURRENT_NEXT_INDICATOR_MASK 0x01 +#define MPEG_PAT_RESERVED_MASK 0xC0 +#define MPEG_PAT_VERSION_NUMBER_MASK 0x3E +#define MPEG_PAT_CURRENT_NEXT_INDICATOR_MASK 0x01 -#define MPEG_PAT_PROGRAM_RESERVED_MASK 0xE000 -#define MPEG_PAT_PROGRAM_MAP_PID_MASK 0x1FFF +#define MPEG_PAT_PROGRAM_RESERVED_MASK 0xE000 +#define MPEG_PAT_PROGRAM_MAP_PID_MASK 0x1FFF static const true_false_string mpeg_pat_cur_next_vals = { - "Currently applicable", "Not yet applicable" + "Currently applicable", "Not yet applicable" }; @@ -66,63 +66,62 @@ static void dissect_mpeg_pat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0, length = 0; - guint16 prog_num = 0, prog_pid; + guint offset = 0, length = 0; + guint16 prog_num, prog_pid; - proto_item *ti; - proto_tree *mpeg_pat_tree; - proto_item *pi; - proto_tree *mpeg_pat_prog_tree; + proto_item *ti; + proto_tree *mpeg_pat_tree; + proto_item *pi; + proto_tree *mpeg_pat_prog_tree; - /* The TVB should start right after the section_length in the Section packet */ + /* The TVB should start right after the section_length in the Section packet */ - col_clear(pinfo->cinfo, COL_INFO); - col_set_str(pinfo->cinfo, COL_INFO, "Program Association Table (PAT)"); + col_set_str(pinfo->cinfo, COL_INFO, "Program Association Table (PAT)"); - ti = proto_tree_add_item(tree, proto_mpeg_pat, tvb, offset, -1, ENC_NA); - mpeg_pat_tree = proto_item_add_subtree(ti, ett_mpeg_pat); + ti = proto_tree_add_item(tree, proto_mpeg_pat, tvb, offset, -1, ENC_NA); + mpeg_pat_tree = proto_item_add_subtree(ti, ett_mpeg_pat); - offset += packet_mpeg_sect_header(tvb, offset, mpeg_pat_tree, &length, NULL); - length -= 4; + offset += packet_mpeg_sect_header(tvb, offset, mpeg_pat_tree, &length, NULL); + length -= 4; - proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; - proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_version_number, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; + proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_version_number, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; + proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; + proto_tree_add_item(mpeg_pat_tree, hf_mpeg_pat_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - if (offset >= length) - return; + if (offset >= length) + return; - /* Parse all the programs */ - while (offset < length) { + /* Parse all the programs */ + while (offset < length) { - prog_num = tvb_get_ntohs(tvb, offset); - prog_pid = tvb_get_ntohs(tvb, offset + 2) & MPEG_PAT_PROGRAM_MAP_PID_MASK; + prog_num = tvb_get_ntohs(tvb, offset); + prog_pid = tvb_get_ntohs(tvb, offset + 2) & MPEG_PAT_PROGRAM_MAP_PID_MASK; - pi = proto_tree_add_text(mpeg_pat_tree, tvb, offset, 4, "Program 0x%04hx -> PID 0x%04hx", prog_num, prog_pid); - mpeg_pat_prog_tree = proto_item_add_subtree(pi, ett_mpeg_pat_prog); + pi = proto_tree_add_text(mpeg_pat_tree, tvb, offset, 4, "Program 0x%04hx -> PID 0x%04hx", prog_num, prog_pid); + mpeg_pat_prog_tree = proto_item_add_subtree(pi, ett_mpeg_pat_prog); - proto_tree_add_item(mpeg_pat_prog_tree, hf_mpeg_pat_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + proto_tree_add_item(mpeg_pat_prog_tree, hf_mpeg_pat_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; - proto_tree_add_item(mpeg_pat_prog_tree, hf_mpeg_pat_program_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(mpeg_pat_prog_tree, hf_mpeg_pat_program_map_pid, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + proto_tree_add_item(mpeg_pat_prog_tree, hf_mpeg_pat_program_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(mpeg_pat_prog_tree, hf_mpeg_pat_program_map_pid, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; - } + } - offset += packet_mpeg_sect_crc(tvb, pinfo, mpeg_pat_tree, 0, offset); - proto_item_set_len(ti, offset); + offset += packet_mpeg_sect_crc(tvb, pinfo, mpeg_pat_tree, 0, offset); + proto_item_set_len(ti, offset); } @@ -130,74 +129,74 @@ void proto_register_mpeg_pat(void) { - static hf_register_info hf[] = { + static hf_register_info hf[] = { - { &hf_mpeg_pat_transport_stream_id, { - "Transport Stream ID", "mpeg_pat.tsid", - FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL - } }, + { &hf_mpeg_pat_transport_stream_id, { + "Transport Stream ID", "mpeg_pat.tsid", + FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL + } }, - { &hf_mpeg_pat_reserved, { - "Reserved", "mpeg_pat.reserved", - FT_UINT8, BASE_HEX, NULL, MPEG_PAT_RESERVED_MASK, NULL, HFILL - } }, + { &hf_mpeg_pat_reserved, { + "Reserved", "mpeg_pat.reserved", + FT_UINT8, BASE_HEX, NULL, MPEG_PAT_RESERVED_MASK, NULL, HFILL + } }, - { &hf_mpeg_pat_version_number, { - "Version Number", "mpeg_pat.version", - FT_UINT8, BASE_HEX, NULL, MPEG_PAT_VERSION_NUMBER_MASK, NULL, HFILL - } }, + { &hf_mpeg_pat_version_number, { + "Version Number", "mpeg_pat.version", + FT_UINT8, BASE_HEX, NULL, MPEG_PAT_VERSION_NUMBER_MASK, NULL, HFILL + } }, - { &hf_mpeg_pat_current_next_indicator, { - "Current/Next Indicator", "mpeg_pat.cur_next_ind", - FT_BOOLEAN, 8, TFS(&mpeg_pat_cur_next_vals), MPEG_PAT_CURRENT_NEXT_INDICATOR_MASK, NULL, HFILL - } }, + { &hf_mpeg_pat_current_next_indicator, { + "Current/Next Indicator", "mpeg_pat.cur_next_ind", + FT_BOOLEAN, 8, TFS(&mpeg_pat_cur_next_vals), MPEG_PAT_CURRENT_NEXT_INDICATOR_MASK, NULL, HFILL + } }, - { &hf_mpeg_pat_section_number, { - "Section Number", "mpeg_pat.sect_num", - FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL - } }, + { &hf_mpeg_pat_section_number, { + "Section Number", "mpeg_pat.sect_num", + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL + } }, - { &hf_mpeg_pat_last_section_number, { - "Last Section Number", "mpeg_pat.last_sect_num", - FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL - } }, + { &hf_mpeg_pat_last_section_number, { + "Last Section Number", "mpeg_pat.last_sect_num", + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL + } }, - { &hf_mpeg_pat_program_number, { - "Program Number", "mpeg_pat.prog_num", - FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL - } }, + { &hf_mpeg_pat_program_number, { + "Program Number", "mpeg_pat.prog_num", + FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL + } }, - { &hf_mpeg_pat_program_reserved, { - "Reserved", "mpeg_pat.prog_reserved", - FT_UINT16, BASE_HEX, NULL, MPEG_PAT_PROGRAM_RESERVED_MASK, NULL, HFILL - } }, + { &hf_mpeg_pat_program_reserved, { + "Reserved", "mpeg_pat.prog_reserved", + FT_UINT16, BASE_HEX, NULL, MPEG_PAT_PROGRAM_RESERVED_MASK, NULL, HFILL + } }, - { &hf_mpeg_pat_program_map_pid, { - "Program Map PID", "mpeg_pat.prog_map_pid", - FT_UINT16, BASE_HEX, NULL, MPEG_PAT_PROGRAM_MAP_PID_MASK, NULL, HFILL - } }, + { &hf_mpeg_pat_program_map_pid, { + "Program Map PID", "mpeg_pat.prog_map_pid", + FT_UINT16, BASE_HEX, NULL, MPEG_PAT_PROGRAM_MAP_PID_MASK, NULL, HFILL + } }, - }; + }; - static gint *ett[] = { - &ett_mpeg_pat, - &ett_mpeg_pat_prog - }; + static gint *ett[] = { + &ett_mpeg_pat, + &ett_mpeg_pat_prog + }; - proto_mpeg_pat = proto_register_protocol("MPEG2 Program Association Table", "MPEG PAT", "mpeg_pat"); + proto_mpeg_pat = proto_register_protocol("MPEG2 Program Association Table", "MPEG PAT", "mpeg_pat"); - proto_register_field_array(proto_mpeg_pat, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_field_array(proto_mpeg_pat, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } void proto_reg_handoff_mpeg_pat(void) { - dissector_handle_t mpeg_pat_handle; + dissector_handle_t mpeg_pat_handle; - mpeg_pat_handle = create_dissector_handle(dissect_mpeg_pat, proto_mpeg_pat); - dissector_add_uint("mpeg_sect.tid", MPEG_PAT_TID, mpeg_pat_handle); + mpeg_pat_handle = create_dissector_handle(dissect_mpeg_pat, proto_mpeg_pat); + dissector_add_uint("mpeg_sect.tid", MPEG_PAT_TID, mpeg_pat_handle); } /* @@ -205,10 +204,10 @@ void proto_reg_handoff_mpeg_pat(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: t + * tab-width: 8 + * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 noexpandtab: - * :indentSize=4:tabSize=4:noTabs=false: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ -- cgit v1.2.3