aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dvb-tdt.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2013-03-14 14:42:12 +0000
committerBill Meier <wmeier@newsguy.com>2013-03-14 14:42:12 +0000
commit77376a2363be6fda0576876db550acfe412dd223 (patch)
tree794079ad93eb7f803d955d85b18ee37d0c331ef0 /epan/dissectors/packet-dvb-tdt.c
parent8dfa2eac7e61a0d46c7b9e0f86a71252903c1ee5 (diff)
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
Diffstat (limited to 'epan/dissectors/packet-dvb-tdt.c')
-rw-r--r--epan/dissectors/packet-dvb-tdt.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c
index a7755365ab..eb76308afc 100644
--- a/epan/dissectors/packet-dvb-tdt.c
+++ b/epan/dissectors/packet-dvb-tdt.c
@@ -35,35 +35,35 @@ static int hf_dvb_tdt_utc_time = -1;
static gint ett_dvb_tdt = -1;
-#define DVB_TDT_TID 0x70
+#define DVB_TDT_TID 0x70
static void
dissect_dvb_tdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- guint offset = 0;
+ guint offset = 0;
- proto_item *ti;
- proto_tree *dvb_tdt_tree;
+ proto_item *ti;
+ proto_tree *dvb_tdt_tree;
- nstime_t utc_time;
+ nstime_t utc_time;
- col_set_str(pinfo->cinfo, COL_INFO, "Time and Date Table (TDT)");
+ col_set_str(pinfo->cinfo, COL_INFO, "Time and Date Table (TDT)");
- ti = proto_tree_add_item(tree, proto_dvb_tdt, tvb, offset, -1, ENC_NA);
- dvb_tdt_tree = proto_item_add_subtree(ti, ett_dvb_tdt);
+ ti = proto_tree_add_item(tree, proto_dvb_tdt, tvb, offset, -1, ENC_NA);
+ dvb_tdt_tree = proto_item_add_subtree(ti, ett_dvb_tdt);
- offset += packet_mpeg_sect_header(tvb, offset, dvb_tdt_tree, NULL, NULL);
+ offset += packet_mpeg_sect_header(tvb, offset, dvb_tdt_tree, NULL, NULL);
- if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &utc_time) < 0) {
- proto_tree_add_text(dvb_tdt_tree, tvb, offset, 5, "Unparseable time");
- } else {
- proto_tree_add_time_format(dvb_tdt_tree, hf_dvb_tdt_utc_time, tvb, offset, 5, &utc_time,
- "UTC Time : %s UTC", abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
- }
- offset += 5;
+ if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &utc_time) < 0) {
+ proto_tree_add_text(dvb_tdt_tree, tvb, offset, 5, "Unparseable time");
+ } else {
+ proto_tree_add_time_format(dvb_tdt_tree, hf_dvb_tdt_utc_time, tvb, offset, 5, &utc_time,
+ "UTC Time : %s UTC", abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
+ }
+ offset += 5;
- proto_item_set_len(ti, offset);
+ proto_item_set_len(ti, offset);
}
@@ -71,33 +71,33 @@ void
proto_register_dvb_tdt(void)
{
- static hf_register_info hf[] = {
+ static hf_register_info hf[] = {
- { &hf_dvb_tdt_utc_time, {
- "UTC Time", "dvb_tdt.utc_time",
- FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL
- } }
- };
+ { &hf_dvb_tdt_utc_time, {
+ "UTC Time", "dvb_tdt.utc_time",
+ FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL
+ } }
+ };
- static gint *ett[] = {
- &ett_dvb_tdt
- };
+ static gint *ett[] = {
+ &ett_dvb_tdt
+ };
- proto_dvb_tdt = proto_register_protocol("DVB Time and Date Table", "DVB TDT", "dvb_tdt");
+ proto_dvb_tdt = proto_register_protocol("DVB Time and Date Table", "DVB TDT", "dvb_tdt");
- proto_register_field_array(proto_dvb_tdt, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
+ proto_register_field_array(proto_dvb_tdt, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void proto_reg_handoff_dvb_tdt(void)
{
- dissector_handle_t dvb_tdt_handle;
+ dissector_handle_t dvb_tdt_handle;
- dvb_tdt_handle = create_dissector_handle(dissect_dvb_tdt, proto_dvb_tdt);
+ dvb_tdt_handle = create_dissector_handle(dissect_dvb_tdt, proto_dvb_tdt);
- dissector_add_uint("mpeg_sect.tid", DVB_TDT_TID, dvb_tdt_handle);
+ dissector_add_uint("mpeg_sect.tid", DVB_TDT_TID, dvb_tdt_handle);
}
/*
@@ -105,10 +105,10 @@ void proto_reg_handoff_dvb_tdt(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:
*/