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, 228 insertions, 228 deletions

diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c
index 2788ea4886..a2424a06ad 100644
--- a/epan/dissectors/packet-mpeg-sect.c
+++ b/epan/dissectors/packet-mpeg-sect.c
@@ -46,100 +46,100 @@ static dissector_table_t mpeg_sect_tid_dissector_table;
 
 static gboolean mpeg_sect_check_crc = FALSE;
 
-#define MPEG_SECT_SYNTAX_INDICATOR_MASK	0x8000
-#define MPEG_SECT_RESERVED_MASK		0x7000
-#define MPEG_SECT_LENGTH_MASK		0x0FFF
+#define MPEG_SECT_SYNTAX_INDICATOR_MASK 0x8000
+#define MPEG_SECT_RESERVED_MASK         0x7000
+#define MPEG_SECT_LENGTH_MASK           0x0FFF
 
 /* From ISO/IEC 13818-1 */
 enum {
-	TID_PAT,
-	TID_CA,
-	TID_PMT,
-	TID_TS_DESC,
-	TID_SCENE_DESC,
-	TID_OBJECT_DESC,
-	TID_FORBIDEN    = 0xFF
+    TID_PAT,
+    TID_CA,
+    TID_PMT,
+    TID_TS_DESC,
+    TID_SCENE_DESC,
+    TID_OBJECT_DESC,
+    TID_FORBIDEN    = 0xFF
 };
 
 /* From ETSI EN 300 468 */
 enum {
-	TID_NIT       = 0x40,
-	TID_NIT_OTHER,
-	TID_SDT,
-	TID_SDT_OTHER = 0x46,
-	TID_BAT       = 0x4A,
-	TID_EIT       = 0x4E,
-	TID_EIT_OTHER,
-	TID_TDT       = 0x70,
-	TID_RST,
-	TID_ST,
-	TID_TOT
+    TID_NIT       = 0x40,
+    TID_NIT_OTHER,
+    TID_SDT,
+    TID_SDT_OTHER = 0x46,
+    TID_BAT       = 0x4A,
+    TID_EIT       = 0x4E,
+    TID_EIT_OTHER,
+    TID_TDT       = 0x70,
+    TID_RST,
+    TID_ST,
+    TID_TOT
 };
 
 /* From ETSI EN 301 790 */
 enum {
-	TID_RMT = 0x41, /* Conflict with TID_NIT_OTHER */
-	TID_SCT = 0xA0,
-	TID_FCT,
-	TID_TCT,
-	TID_SPT,
-	TID_CMT,
-	TID_TBTP,
-	TID_PCR,
-	TID_TIM = 0xB0
+    TID_RMT = 0x41, /* Conflict with TID_NIT_OTHER */
+    TID_SCT = 0xA0,
+    TID_FCT,
+    TID_TCT,
+    TID_SPT,
+    TID_CMT,
+    TID_TBTP,
+    TID_PCR,
+    TID_TIM = 0xB0
 };
 
 /* From ESTI EN 301 192 */
 enum {
-	TID_DVB_MPE = 0x3E
+    TID_DVB_MPE = 0x3E
 };
 
 /* From OC-SP-ETV-AM 1.0-IO5 */
 enum {
-	TID_ETV_EISS = 0xE0,
-	TID_ETV_DII  = 0xE3,
-	TID_ETV_DDB  = 0xE4
+    TID_ETV_EISS = 0xE0,
+    TID_ETV_DII  = 0xE3,
+    TID_ETV_DDB  = 0xE4
 };
 
 /* From ETSI TS 102 899 */
 enum {
-	TID_AIT = 0x74
+    TID_AIT = 0x74
 };
 
 
 static const value_string mpeg_sect_table_id_vals[] = {
 
-	{ TID_PAT,         "Program Association Table (PAT)" },
-	{ TID_CA,          "Conditional Access (CA)" },
-	{ TID_PMT,         "Program Map Table (PMT)" },
-	{ TID_TS_DESC,     "Transport Stream Description" },
-	{ TID_SCENE_DESC,  "ISO/IEC 14496 Scene Description" },
-	{ TID_OBJECT_DESC, "ISO/IEC 14496 Object Description" },
-	{ TID_NIT,         "Network Information Table (NIT), current network" },
-	{ TID_NIT_OTHER,   "Network Information Table (NIT), other network" },
-	{ TID_SDT,         "Service Description Table (SDT), current network" },
-	{ TID_SDT_OTHER,   "Service Description (SDT), other network" },
-	{ TID_BAT,         "Bouquet Associatoin Table (BAT)" },
-	{ TID_EIT,         "Event Information Table (EIT), actual TS" },
-	{ TID_EIT_OTHER,   "Event Information Table (EIT), other TS" },
-	{ TID_TDT,         "Time and Date Table (TDT)" },
-	{ TID_RST,         "Running Status Table (RST)" },
-	{ TID_ST,          "Stuffing Table (ST)" },
-	{ TID_TOT,         "Time Offset Table (TOT)" },
-	{ TID_AIT,         "Application Information Table (AIT)" },
-	{ TID_SCT,         "Superframe Composition Table (SCT)" },
-	{ TID_FCT,         "Frame Composition Table (FCT)" },
-	{ TID_TCT,         "Time-Slot Composition Table (TCT)" },
-	{ TID_SPT,         "Satellite Position Table (SPT)" },
-	{ TID_CMT,         "Correction Message Table (CMT)" },
-	{ TID_TBTP,        "Terminal Burst Time Plan (TBTP)" },
-	{ TID_TIM,         "Terminal Information Message (TIM)" },
-	{ TID_DVB_MPE,     "DVB MultiProtocol Encapsulation (MPE)" },
-	{ TID_ETV_EISS,    "ETV Integrated Signaling Stream (EISS)" },
-	{ TID_ETV_DII,     "ETV Download Info Indication" },
-	{ TID_ETV_DDB,     "ETV Download Data Block" },
-	{ TID_FORBIDEN,    "Forbidden" },
-	{ 0, NULL }
+    { TID_PAT,         "Program Association Table (PAT)" },
+    { TID_CA,          "Conditional Access (CA)" },
+    { TID_PMT,         "Program Map Table (PMT)" },
+    { TID_TS_DESC,     "Transport Stream Description" },
+    { TID_SCENE_DESC,  "ISO/IEC 14496 Scene Description" },
+    { TID_OBJECT_DESC, "ISO/IEC 14496 Object Description" },
+    { TID_NIT,         "Network Information Table (NIT), current network" },
+    { TID_NIT_OTHER,   "Network Information Table (NIT), other network" },
+    { TID_SDT,         "Service Description Table (SDT), current network" },
+    { TID_SDT_OTHER,   "Service Description (SDT), other network" },
+    { TID_BAT,         "Bouquet Associatoin Table (BAT)" },
+    { TID_EIT,         "Event Information Table (EIT), actual TS" },
+    { TID_EIT_OTHER,   "Event Information Table (EIT), other TS" },
+    { TID_TDT,         "Time and Date Table (TDT)" },
+    { TID_RST,         "Running Status Table (RST)" },
+    { TID_ST,          "Stuffing Table (ST)" },
+    { TID_TOT,         "Time Offset Table (TOT)" },
+    { TID_AIT,         "Application Information Table (AIT)" },
+    { TID_SCT,         "Superframe Composition Table (SCT)" },
+    { TID_FCT,         "Frame Composition Table (FCT)" },
+    { TID_TCT,         "Time-Slot Composition Table (TCT)" },
+    { TID_SPT,         "Satellite Position Table (SPT)" },
+    { TID_CMT,         "Correction Message Table (CMT)" },
+    { TID_TBTP,        "Terminal Burst Time Plan (TBTP)" },
+    { TID_TIM,         "Terminal Information Message (TIM)" },
+    { TID_DVB_MPE,     "DVB MultiProtocol Encapsulation (MPE)" },
+    { TID_ETV_EISS,    "ETV Integrated Signaling Stream (EISS)" },
+    { TID_ETV_DII,     "ETV Download Info Indication" },
+    { TID_ETV_DDB,     "ETV Download Data Block" },
+    { TID_FORBIDEN,    "Forbidden" },
+    { 0, NULL }
 };
 
 /* From packet-dvbci.c
@@ -150,213 +150,213 @@ static const value_string mpeg_sect_table_id_vals[] = {
 gint
 packet_mpeg_sect_mjd_to_utc_time(tvbuff_t *tvb, gint offset, nstime_t *utc_time)
 {
-	gint   bcd_time_offset;     /* start offset of the bcd time in the tvbuff */
-	guint8 hour, min, sec;
-
-	if (!utc_time)
-		return -1;
-
-	nstime_set_zero(utc_time);
-	utc_time->secs  = (tvb_get_ntohs(tvb, offset) - 40587) * 86400;
-	bcd_time_offset = offset+2;
-	hour            = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset));
-	min             = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset+1));
-	sec             = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset+2));
-	if (hour>23 || min>59 || sec>59)
-		return -1;
-
-	utc_time->secs += hour*3600 + min*60 + sec;
-	return 5;
+    gint   bcd_time_offset;     /* start offset of the bcd time in the tvbuff */
+    guint8 hour, min, sec;
+
+    if (!utc_time)
+        return -1;
+
+    nstime_set_zero(utc_time);
+    utc_time->secs  = (tvb_get_ntohs(tvb, offset) - 40587) * 86400;
+    bcd_time_offset = offset+2;
+    hour            = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset));
+    min             = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset+1));
+    sec             = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset+2));
+    if (hour>23 || min>59 || sec>59)
+        return -1;
+
+    utc_time->secs += hour*3600 + min*60 + sec;
+    return 5;
 }
 
 guint
 packet_mpeg_sect_header(tvbuff_t *tvb, guint offset,
-			proto_tree *tree, guint *sect_len, gboolean *ssi)
+            proto_tree *tree, guint *sect_len, gboolean *ssi)
 {
-	return packet_mpeg_sect_header_extra(tvb, offset, tree, sect_len,
-					     NULL, ssi, NULL);
+    return packet_mpeg_sect_header_extra(tvb, offset, tree, sect_len,
+                         NULL, ssi, NULL);
 }
 
 guint
 packet_mpeg_sect_header_extra(tvbuff_t *tvb, guint offset, proto_tree *tree,
-				guint *sect_len, guint *reserved, gboolean *ssi,
-				proto_item **items)
+                guint *sect_len, guint *reserved, gboolean *ssi,
+                proto_item **items)
 {
-	guint       tmp;
-	guint       len = 0;
-	proto_item *pi[PACKET_MPEG_SECT_PI__SIZE];
-	gint        i;
+    guint       tmp;
+    guint       len = 0;
+    proto_item *pi[PACKET_MPEG_SECT_PI__SIZE];
+    gint        i;
 
-	for (i = 0; i < PACKET_MPEG_SECT_PI__SIZE; i++) {
-		pi[i] = NULL;
-	}
+    for (i = 0; i < PACKET_MPEG_SECT_PI__SIZE; i++) {
+        pi[i] = NULL;
+    }
 
-	if (tree) {
-		pi[PACKET_MPEG_SECT_PI__TABLE_ID] =
-			proto_tree_add_item(tree, hf_mpeg_sect_table_id,
-					tvb, offset + len, 1, ENC_BIG_ENDIAN);
-	}
+    if (tree) {
+        pi[PACKET_MPEG_SECT_PI__TABLE_ID] =
+            proto_tree_add_item(tree, hf_mpeg_sect_table_id,
+                    tvb, offset + len, 1, ENC_BIG_ENDIAN);
+    }
 
-	len++;
+    len++;
 
-	if (tree) {
-		pi[PACKET_MPEG_SECT_PI__SSI] =
-			proto_tree_add_item(tree, hf_mpeg_sect_syntax_indicator,
-					tvb, offset + len, 2, ENC_BIG_ENDIAN);
+    if (tree) {
+        pi[PACKET_MPEG_SECT_PI__SSI] =
+            proto_tree_add_item(tree, hf_mpeg_sect_syntax_indicator,
+                    tvb, offset + len, 2, ENC_BIG_ENDIAN);
 
-		pi[PACKET_MPEG_SECT_PI__RESERVED] =
-			proto_tree_add_item(tree, hf_mpeg_sect_reserved, tvb,
-					offset + len, 2, ENC_BIG_ENDIAN);
+        pi[PACKET_MPEG_SECT_PI__RESERVED] =
+            proto_tree_add_item(tree, hf_mpeg_sect_reserved, tvb,
+                    offset + len, 2, ENC_BIG_ENDIAN);
 
-		pi[PACKET_MPEG_SECT_PI__LENGTH] =
-			proto_tree_add_item(tree, hf_mpeg_sect_length, tvb,
-					offset + len, 2, ENC_BIG_ENDIAN);
-	}
+        pi[PACKET_MPEG_SECT_PI__LENGTH] =
+            proto_tree_add_item(tree, hf_mpeg_sect_length, tvb,
+                    offset + len, 2, ENC_BIG_ENDIAN);
+    }
 
-	tmp = tvb_get_ntohs(tvb, offset + len);
+    tmp = tvb_get_ntohs(tvb, offset + len);
 
-	if (sect_len)
-		*sect_len = MPEG_SECT_LENGTH_MASK & tmp;
+    if (sect_len)
+        *sect_len = MPEG_SECT_LENGTH_MASK & tmp;
 
-	if (reserved)
-		*reserved = (MPEG_SECT_RESERVED_MASK & tmp) >> 12;
+    if (reserved)
+        *reserved = (MPEG_SECT_RESERVED_MASK & tmp) >> 12;
 
-	if (ssi)
-		*ssi = (MPEG_SECT_SYNTAX_INDICATOR_MASK & tmp);
+    if (ssi)
+        *ssi = (MPEG_SECT_SYNTAX_INDICATOR_MASK & tmp);
 
-	if (items) {
-		for (i = 0; i < PACKET_MPEG_SECT_PI__SIZE; i++) {
-			items[i] = pi[i];
-		}
-	}
+    if (items) {
+        for (i = 0; i < PACKET_MPEG_SECT_PI__SIZE; i++) {
+            items[i] = pi[i];
+        }
+    }
 
-	len += 2;
+    len += 2;
 
-	return len;
+    return len;
 }
 
 
 guint
 packet_mpeg_sect_crc(tvbuff_t *tvb, packet_info *pinfo,
-		     proto_tree *tree, guint start, guint end)
+             proto_tree *tree, guint start, guint end)
 {
-	guint32     crc, calculated_crc;
-	const char *label;
-
-	crc = tvb_get_ntohl(tvb, end);
-
-	calculated_crc = crc;
-	label = "Unverified";
-	if (mpeg_sect_check_crc) {
-		label = "Verified";
-		calculated_crc = crc32_mpeg2_tvb_offset(tvb, start, end);
-	}
-
-	if (calculated_crc == crc) {
-		proto_tree_add_uint_format( tree, hf_mpeg_sect_crc, tvb,
-			end, 4, crc, "CRC: 0x%08x [%s]", crc, label);
-	} else {
-		proto_item *msg_error = NULL;
-
-		msg_error = proto_tree_add_uint_format( tree, hf_mpeg_sect_crc, tvb,
-							end, 4, crc,
-							"CRC: 0x%08x [Failed Verification (Calculated: 0x%08x)]",
-							crc, calculated_crc );
-		PROTO_ITEM_SET_GENERATED(msg_error);
-		expert_add_info_format( pinfo, msg_error, PI_MALFORMED,
-					PI_ERROR, "Invalid CRC" );
-	}
-
-	return 4;
+    guint32     crc, calculated_crc;
+    const char *label;
+
+    crc = tvb_get_ntohl(tvb, end);
+
+    calculated_crc = crc;
+    label = "Unverified";
+    if (mpeg_sect_check_crc) {
+        label = "Verified";
+        calculated_crc = crc32_mpeg2_tvb_offset(tvb, start, end);
+    }
+
+    if (calculated_crc == crc) {
+        proto_tree_add_uint_format( tree, hf_mpeg_sect_crc, tvb,
+            end, 4, crc, "CRC: 0x%08x [%s]", crc, label);
+    } else {
+        proto_item *msg_error = NULL;
+
+        msg_error = proto_tree_add_uint_format( tree, hf_mpeg_sect_crc, tvb,
+                            end, 4, crc,
+                            "CRC: 0x%08x [Failed Verification (Calculated: 0x%08x)]",
+                            crc, calculated_crc );
+        PROTO_ITEM_SET_GENERATED(msg_error);
+        expert_add_info_format( pinfo, msg_error, PI_MALFORMED,
+                    PI_ERROR, "Invalid CRC" );
+    }
+
+    return 4;
 }
 
 
 static void
 dissect_mpeg_sect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	gint     offset           = 0;
-	guint    section_length   = 0;
-	gboolean syntax_indicator = FALSE;
-	guint8   table_id;
+    gint     offset           = 0;
+    guint    section_length   = 0;
+    gboolean syntax_indicator = FALSE;
+    guint8   table_id;
 
-	proto_item *ti;
-	proto_tree *mpeg_sect_tree;
+    proto_item *ti;
+    proto_tree *mpeg_sect_tree;
 
-	table_id = tvb_get_guint8(tvb, offset);
+    table_id = tvb_get_guint8(tvb, offset);
 
-	/* Check if a dissector can parse the current table */
-	if (dissector_try_uint(mpeg_sect_tid_dissector_table, table_id, tvb, pinfo, tree))
-		return;
+    /* Check if a dissector can parse the current table */
+    if (dissector_try_uint(mpeg_sect_tid_dissector_table, table_id, tvb, pinfo, tree))
+        return;
 
-	/* If no dissector is registered, use the common one */
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG SECT");
-	col_add_fstr(pinfo->cinfo, COL_INFO, "Table ID 0x%02x", table_id);
+    /* If no dissector is registered, use the common one */
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG SECT");
+    col_add_fstr(pinfo->cinfo, COL_INFO, "Table ID 0x%02x", table_id);
 
-	ti = proto_tree_add_item(tree, proto_mpeg_sect, tvb, offset, -1, ENC_NA);
-	mpeg_sect_tree = proto_item_add_subtree(ti, ett_mpeg_sect);
+    ti = proto_tree_add_item(tree, proto_mpeg_sect, tvb, offset, -1, ENC_NA);
+    mpeg_sect_tree = proto_item_add_subtree(ti, ett_mpeg_sect);
 
-	proto_item_append_text(ti, " Table_ID=0x%02x", table_id);
+    proto_item_append_text(ti, " Table_ID=0x%02x", table_id);
 
-	packet_mpeg_sect_header(tvb, offset, mpeg_sect_tree,
-				&section_length, &syntax_indicator);
+    packet_mpeg_sect_header(tvb, offset, mpeg_sect_tree,
+                &section_length, &syntax_indicator);
 
-	if (syntax_indicator)
-		packet_mpeg_sect_crc(tvb, pinfo, mpeg_sect_tree, 0, (section_length-1));
+    if (syntax_indicator)
+        packet_mpeg_sect_crc(tvb, pinfo, mpeg_sect_tree, 0, (section_length-1));
 }
 
 
 void
 proto_register_mpeg_sect(void)
 {
-	static hf_register_info hf[] = {
-		{ &hf_mpeg_sect_table_id, {
-			"Table ID", "mpeg_sect.tid",
-			FT_UINT8, BASE_HEX, VALS(mpeg_sect_table_id_vals), 0, NULL, HFILL
-		} },
-
-		{ &hf_mpeg_sect_syntax_indicator, {
-			"Syntax indicator", "mpeg_sect.syntax_indicator",
-			FT_UINT16, BASE_DEC, NULL, MPEG_SECT_SYNTAX_INDICATOR_MASK, NULL, HFILL
-		} },
-
-		{ &hf_mpeg_sect_reserved, {
-			"Reserved", "mpeg_sect.reserved",
-			FT_UINT16, BASE_HEX, NULL, MPEG_SECT_RESERVED_MASK, NULL, HFILL
-		} },
-
-		{ &hf_mpeg_sect_length, {
-			"Length", "mpeg_sect.len",
-			FT_UINT16, BASE_DEC, NULL, MPEG_SECT_LENGTH_MASK, NULL, HFILL
-		} },
-
-		{ &hf_mpeg_sect_crc, {
-			"CRC 32", "mpeg_sect.crc",
-			FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL
-		} }
-	};
-
-	static gint *ett[] = {
-		&ett_mpeg_sect
-	};
-	module_t *mpeg_sect_module;
-
-	proto_mpeg_sect = proto_register_protocol("MPEG2 Section", "MPEG SECT", "mpeg_sect");
-	register_dissector("mpeg_sect", dissect_mpeg_sect, proto_mpeg_sect);
-
-	proto_register_field_array(proto_mpeg_sect, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-
-	mpeg_sect_module = prefs_register_protocol(proto_mpeg_sect, NULL);
-
-	prefs_register_bool_preference(mpeg_sect_module,
-		"verify_crc",
-		"Verify the section CRC",
-		"Whether the section dissector should verify the CRC",
-		&mpeg_sect_check_crc);
-
-	mpeg_sect_tid_dissector_table = register_dissector_table("mpeg_sect.tid",
-								 "MPEG SECT Table ID",
-								 FT_UINT8, BASE_HEX);
+    static hf_register_info hf[] = {
+        { &hf_mpeg_sect_table_id, {
+            "Table ID", "mpeg_sect.tid",
+            FT_UINT8, BASE_HEX, VALS(mpeg_sect_table_id_vals), 0, NULL, HFILL
+        } },
+
+        { &hf_mpeg_sect_syntax_indicator, {
+            "Syntax indicator", "mpeg_sect.syntax_indicator",
+            FT_UINT16, BASE_DEC, NULL, MPEG_SECT_SYNTAX_INDICATOR_MASK, NULL, HFILL
+        } },
+
+        { &hf_mpeg_sect_reserved, {
+            "Reserved", "mpeg_sect.reserved",
+            FT_UINT16, BASE_HEX, NULL, MPEG_SECT_RESERVED_MASK, NULL, HFILL
+        } },
+
+        { &hf_mpeg_sect_length, {
+            "Length", "mpeg_sect.len",
+            FT_UINT16, BASE_DEC, NULL, MPEG_SECT_LENGTH_MASK, NULL, HFILL
+        } },
+
+        { &hf_mpeg_sect_crc, {
+            "CRC 32", "mpeg_sect.crc",
+            FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL
+        } }
+    };
+
+    static gint *ett[] = {
+        &ett_mpeg_sect
+    };
+    module_t *mpeg_sect_module;
+
+    proto_mpeg_sect = proto_register_protocol("MPEG2 Section", "MPEG SECT", "mpeg_sect");
+    register_dissector("mpeg_sect", dissect_mpeg_sect, proto_mpeg_sect);
+
+    proto_register_field_array(proto_mpeg_sect, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    mpeg_sect_module = prefs_register_protocol(proto_mpeg_sect, NULL);
+
+    prefs_register_bool_preference(mpeg_sect_module,
+        "verify_crc",
+        "Verify the section CRC",
+        "Whether the section dissector should verify the CRC",
+        &mpeg_sect_check_crc);
+
+    mpeg_sect_tid_dissector_table = register_dissector_table("mpeg_sect.tid",
+                                 "MPEG SECT Table ID",
+                                 FT_UINT8, BASE_HEX);
 
 }
 
@@ -365,10 +365,10 @@ proto_register_mpeg_sect(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:
  */