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

1 files changed, 165 insertions, 166 deletions

diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c
index ae214fd5b6..12b96e5355 100644
--- a/epan/dissectors/packet-dvb-bat.c
+++ b/epan/dissectors/packet-dvb-bat.c
@@ -55,120 +55,119 @@ static gint ett_dvb_bat = -1;
 static gint ett_dvb_bat_transport_stream = -1;
 
 
-#define DVB_BAT_TID					0x4A
+#define DVB_BAT_TID                                 0x4A
 
-#define DVB_BAT_RESERVED1_MASK				0xC0
-#define DVB_BAT_VERSION_NUMBER_MASK			0x3E
-#define DVB_BAT_CURRENT_NEXT_INDICATOR_MASK		0x01
+#define DVB_BAT_RESERVED1_MASK                      0xC0
+#define DVB_BAT_VERSION_NUMBER_MASK                 0x3E
+#define DVB_BAT_CURRENT_NEXT_INDICATOR_MASK         0x01
 
-#define DVB_BAT_RESERVED2_MASK				0xF000
-#define DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK		0x0FFF
+#define DVB_BAT_RESERVED2_MASK                    0xF000
+#define DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK   0x0FFF
 
-#define DVB_BAT_RESERVED3_MASK				0xF000
-#define DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK	0x0FFF
+#define DVB_BAT_RESERVED3_MASK                    0xF000
+#define DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK 0x0FFF
 
-#define DVB_BAT_RESERVED4_MASK				0xF000
-#define DVB_BAT_TRANSPORT_DESCRIPTORS_LENGTH_MASK	0x0FFF
+#define DVB_BAT_RESERVED4_MASK                    0xF000
+#define DVB_BAT_TRANSPORT_DESCRIPTORS_LENGTH_MASK 0x0FFF
 
 static const value_string dvb_bat_cur_next_vals[] = {
-	{ 0, "Not yet applicable" },
-	{ 1, "Currently applicable" },
+    { 0, "Not yet applicable" },
+    { 1, "Currently applicable" },
 
-	{ 0, NULL }
+    { 0, NULL }
 };
 
 static const value_string dvb_bat_running_status_vals[] = {
-	{ 0, "Undefined" },
-	{ 1, "Not Running" },
-	{ 2, "Starts in a few seconds" },
-	{ 3, "Pausing" },
-	{ 4, "Running" },
-	{ 5, "Service off-air" },
-
-	{ 0, NULL }
+    { 0, "Undefined" },
+    { 1, "Not Running" },
+    { 2, "Starts in a few seconds" },
+    { 3, "Pausing" },
+    { 4, "Running" },
+    { 5, "Service off-air" },
+
+    { 0, NULL }
 };
 
 static const value_string dvb_bat_free_ca_mode_vals[] = {
-	{ 0, "Not Scrambled" },
-	{ 1, "One or more component scrambled" },
+    { 0, "Not Scrambled" },
+    { 1, "One or more component scrambled" },
 
-	{ 0, NULL }
+    { 0, NULL }
 };
 
 static void
 dissect_dvb_bat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 
-	guint offset = 0, length = 0, descriptor_end = 0, ts_loop_end = 0;
-	guint16 ts_id = 0, descriptor_len = 0, ts_loop_len = 0;
+    guint   offset = 0, length = 0, descriptor_end, ts_loop_end;
+    guint16 ts_id, descriptor_len, ts_loop_len;
 
-	proto_item *ti;
-	proto_tree *dvb_bat_tree;
-	proto_item *tsi;
-	proto_tree *transport_stream_tree;
+    proto_item *ti;
+    proto_tree *dvb_bat_tree;
+    proto_item *tsi;
+    proto_tree *transport_stream_tree;
 
-	col_clear(pinfo->cinfo, COL_INFO);
-	col_set_str(pinfo->cinfo, COL_INFO, "Bouquet Association Table (BAT)");
+    col_set_str(pinfo->cinfo, COL_INFO, "Bouquet Association Table (BAT)");
 
-	ti = proto_tree_add_item(tree, proto_dvb_bat, tvb, offset, -1, ENC_NA);
-	dvb_bat_tree = proto_item_add_subtree(ti, ett_dvb_bat);
+    ti = proto_tree_add_item(tree, proto_dvb_bat,                              tvb, offset, -1, ENC_NA);
+    dvb_bat_tree = proto_item_add_subtree(ti, ett_dvb_bat);
 
-	offset += packet_mpeg_sect_header(tvb, offset, dvb_bat_tree, &length, NULL);
-	length -= 4;
+    offset += packet_mpeg_sect_header(tvb, offset, dvb_bat_tree, &length, NULL);
+    length -= 4;
 
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_bouquet_id, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_bouquet_id,                   tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved1, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_version_number, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset++;
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved1,                    tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_version_number,               tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_current_next_indicator,       tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset++;
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_section_number,               tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset++;
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_last_section_number,          tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	descriptor_len = tvb_get_ntohs(tvb, offset) & DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK;
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN);
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_bouquet_descriptors_length, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    descriptor_len = tvb_get_ntohs(tvb, offset) & DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK;
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved2,                    tvb, offset, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_bouquet_descriptors_length,   tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	descriptor_end = offset + descriptor_len;
-	while (offset < descriptor_end)
-		offset += proto_mpeg_descriptor_dissect(tvb, offset, dvb_bat_tree);
+    descriptor_end = offset + descriptor_len;
+    while (offset < descriptor_end)
+        offset += proto_mpeg_descriptor_dissect(tvb, offset, dvb_bat_tree);
 
-	ts_loop_len = tvb_get_ntohs(tvb, offset) & DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK;
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved3, tvb, offset, 2, ENC_BIG_ENDIAN);
-	proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_transport_stream_loop_length, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    ts_loop_len = tvb_get_ntohs(tvb, offset) & DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK;
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved3,                    tvb, offset, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_transport_stream_loop_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	ts_loop_end = offset + ts_loop_len;
-	while (offset < ts_loop_end) {
-		ts_id = tvb_get_ntohs(tvb, offset);
-		descriptor_len = tvb_get_ntohs(tvb, offset + 4) & DVB_BAT_TRANSPORT_DESCRIPTORS_LENGTH_MASK;
+    ts_loop_end = offset + ts_loop_len;
+    while (offset < ts_loop_end) {
+        ts_id = tvb_get_ntohs(tvb, offset);
+        descriptor_len = tvb_get_ntohs(tvb, offset + 4) & DVB_BAT_TRANSPORT_DESCRIPTORS_LENGTH_MASK;
 
-		tsi = proto_tree_add_text(dvb_bat_tree, tvb, offset, 6 + descriptor_len, "Transport Stream 0x%04x", ts_id);
-		transport_stream_tree = proto_item_add_subtree(tsi, ett_dvb_bat_transport_stream);
+        tsi = proto_tree_add_text(dvb_bat_tree, tvb, offset, 6 + descriptor_len, "Transport Stream 0x%04x", ts_id);
+        transport_stream_tree = proto_item_add_subtree(tsi, ett_dvb_bat_transport_stream);
 
-		proto_tree_add_item(transport_stream_tree, hf_dvb_bat_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
+        proto_tree_add_item(transport_stream_tree, hf_dvb_bat_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
 
-		proto_tree_add_item(transport_stream_tree, hf_dvb_bat_original_network_id, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
+        proto_tree_add_item(transport_stream_tree, hf_dvb_bat_original_network_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
 
-		proto_tree_add_item(transport_stream_tree, hf_dvb_bat_reserved4, tvb, offset, 2, ENC_BIG_ENDIAN);
-		proto_tree_add_item(transport_stream_tree, hf_dvb_bat_transport_descriptors_length, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
+        proto_tree_add_item(transport_stream_tree, hf_dvb_bat_reserved4, tvb, offset, 2, ENC_BIG_ENDIAN);
+        proto_tree_add_item(transport_stream_tree, hf_dvb_bat_transport_descriptors_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
 
-		descriptor_end = offset + descriptor_len;
-		while (offset < descriptor_end)
-			offset += proto_mpeg_descriptor_dissect(tvb, offset, transport_stream_tree);
-	}
+        descriptor_end = offset + descriptor_len;
+        while (offset < descriptor_end)
+            offset += proto_mpeg_descriptor_dissect(tvb, offset, transport_stream_tree);
+    }
 
-	offset += packet_mpeg_sect_crc(tvb, pinfo, dvb_bat_tree, 0, offset);
-	proto_item_set_len(ti, offset);
+    offset += packet_mpeg_sect_crc(tvb, pinfo, dvb_bat_tree, 0, offset);
+    proto_item_set_len(ti, offset);
 }
 
 
@@ -176,100 +175,100 @@ void
 proto_register_dvb_bat(void)
 {
 
-	static hf_register_info hf[] = {
-
-		{ &hf_dvb_bat_bouquet_id, {
-			"Service ID", "dvb_bat.sid",
-			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_reserved1, {
-			"Reserved", "dvb_bat.reserved1",
-			FT_UINT8, BASE_HEX, NULL, DVB_BAT_RESERVED1_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_version_number, {
-			"Version Number", "dvb_bat.version",
-			FT_UINT8, BASE_HEX, NULL, DVB_BAT_VERSION_NUMBER_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_current_next_indicator, {
-			"Current/Next Indicator", "dvb_bat.cur_next_ind",
-			FT_UINT8, BASE_DEC, VALS(dvb_bat_cur_next_vals), DVB_BAT_CURRENT_NEXT_INDICATOR_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_section_number, {
-			"Section Number", "dvb_bat.sect_num",
-			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_last_section_number, {
-			"Last Section Number", "dvb_bat.last_sect_num",
-			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_reserved2, {
-			"Reserved", "dvb_bat.reserved2",
-			FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED2_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_bouquet_descriptors_length, {
-			"Bouquet Descriptors Length", "dvb_bat.bouquet_desc_len",
-			FT_UINT16, BASE_DEC, NULL, DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_reserved3, {
-			"Reserved", "dvb_bat.reserved3",
-			FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED3_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_transport_stream_loop_length, {
-			"Transport Stream Loop Length", "dvb_bat.ts_loop_len",
-			FT_UINT16, BASE_DEC, NULL, DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_transport_stream_id, {
-			"Transport Stream ID", "dvb_bat.ts.id",
-			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_original_network_id, {
-			"Original Network ID", "dvb_bat.ts.original_nid",
-			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_reserved4, {
-			"Reserved", "dvb_bat.ts.reserved",
-			FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED4_MASK, NULL, HFILL
-		} },
-
-		{ &hf_dvb_bat_transport_descriptors_length, {
-			"Bouquet Descriptors Length", "dvb_bat.ts.desc_len",
-			FT_UINT16, BASE_DEC, NULL, DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK, NULL, HFILL
-		} },
-
-	};
-
-	static gint *ett[] = {
-		&ett_dvb_bat,
-		&ett_dvb_bat_transport_stream
-	};
-
-	proto_dvb_bat = proto_register_protocol("DVB Bouquet Association Table", "DVB BAT", "dvb_bat");
-
-	proto_register_field_array(proto_dvb_bat, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+    static hf_register_info hf[] = {
+
+        { &hf_dvb_bat_bouquet_id, {
+            "Service ID", "dvb_bat.sid",
+            FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_reserved1, {
+            "Reserved", "dvb_bat.reserved1",
+            FT_UINT8, BASE_HEX, NULL, DVB_BAT_RESERVED1_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_version_number, {
+            "Version Number", "dvb_bat.version",
+            FT_UINT8, BASE_HEX, NULL, DVB_BAT_VERSION_NUMBER_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_current_next_indicator, {
+            "Current/Next Indicator", "dvb_bat.cur_next_ind",
+            FT_UINT8, BASE_DEC, VALS(dvb_bat_cur_next_vals), DVB_BAT_CURRENT_NEXT_INDICATOR_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_section_number, {
+            "Section Number", "dvb_bat.sect_num",
+            FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_last_section_number, {
+            "Last Section Number", "dvb_bat.last_sect_num",
+            FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_reserved2, {
+            "Reserved", "dvb_bat.reserved2",
+            FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED2_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_bouquet_descriptors_length, {
+            "Bouquet Descriptors Length", "dvb_bat.bouquet_desc_len",
+            FT_UINT16, BASE_DEC, NULL, DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_reserved3, {
+            "Reserved", "dvb_bat.reserved3",
+            FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED3_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_transport_stream_loop_length, {
+            "Transport Stream Loop Length", "dvb_bat.ts_loop_len",
+            FT_UINT16, BASE_DEC, NULL, DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_transport_stream_id, {
+            "Transport Stream ID", "dvb_bat.ts.id",
+            FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_original_network_id, {
+            "Original Network ID", "dvb_bat.ts.original_nid",
+            FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_reserved4, {
+            "Reserved", "dvb_bat.ts.reserved",
+            FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED4_MASK, NULL, HFILL
+        } },
+
+        { &hf_dvb_bat_transport_descriptors_length, {
+            "Bouquet Descriptors Length", "dvb_bat.ts.desc_len",
+            FT_UINT16, BASE_DEC, NULL, DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK, NULL, HFILL
+        } },
+
+    };
+
+    static gint *ett[] = {
+        &ett_dvb_bat,
+        &ett_dvb_bat_transport_stream
+    };
+
+    proto_dvb_bat = proto_register_protocol("DVB Bouquet Association Table", "DVB BAT", "dvb_bat");
+
+    proto_register_field_array(proto_dvb_bat, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
 
 }
 
 
 void proto_reg_handoff_dvb_bat(void)
 {
-	dissector_handle_t dvb_bat_handle;
+    dissector_handle_t dvb_bat_handle;
 
-	dvb_bat_handle = create_dissector_handle(dissect_dvb_bat, proto_dvb_bat);
+    dvb_bat_handle = create_dissector_handle(dissect_dvb_bat, proto_dvb_bat);
 
-	dissector_add_uint("mpeg_sect.tid", DVB_BAT_TID, dvb_bat_handle);
+    dissector_add_uint("mpeg_sect.tid", DVB_BAT_TID, dvb_bat_handle);
 }
 
 /*
@@ -277,10 +276,10 @@ void proto_reg_handoff_dvb_bat(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:
  */