aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-turbocell.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-06-18 21:30:42 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-06-18 21:30:42 +0000
commitb228488bc0b9d5e0c63b15814836f7332f35ce04 (patch)
tree62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-turbocell.c
parentdec6ea57aefdcebc4bacd3934606ad0d78da446e (diff)
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-turbocell.c')
-rw-r--r--epan/dissectors/packet-turbocell.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 417bdb6657..5c0b23827a 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -290,7 +290,7 @@ void proto_register_turbocell(void)
{ &hf_turbocell_ip,
{ "IP", "turbocell.ip",
- FT_IPv4, BASE_DEC, NULL, 0,
+ FT_IPv4, BASE_NONE, NULL, 0,
"IP adress of base station ?", HFILL }
},
@@ -308,7 +308,7 @@ void proto_register_turbocell(void)
{ &hf_turbocell_name,
{ "Network Name", "turbocell.name",
FT_STRINGZ, BASE_NONE, NULL, 0,
- "Network Name", HFILL }
+ NULL, HFILL }
},
STATION(0),STATION(1),STATION(2),STATION(3),STATION(4),STATION(5),STATION(6),STATION(7),STATION(8),STATION(9),
STATION(10),STATION(11),STATION(12),STATION(13),STATION(14),STATION(15),STATION(16),STATION(17),STATION(18),STATION(19),
@@ -319,11 +319,11 @@ void proto_register_turbocell(void)
static hf_register_info aggregate_fields[] = {
{ &hf_turbocell_aggregate_msdu_header_text,
{"MAC Service Data Unit (MSDU)", "turbocell_aggregate.msduheader",
- FT_UINT16, BASE_DEC, 0, 0x0000, "MAC Service Data Unit (MSDU)", HFILL }
+ FT_UINT16, BASE_DEC, 0, 0x0000, NULL, HFILL }
},
{ &hf_turbocell_aggregate_msdu_len,
{"MSDU length", "turbocell_aggregate.msdulen",
- FT_UINT16, BASE_DEC_HEX, 0, 0x0FFF, "MSDU length", HFILL }
+ FT_UINT16, BASE_DEC_HEX, 0, 0x0FFF, NULL, HFILL }
},
{ &hf_turbocell_aggregate_len,
{ "Total Length", "turbocell_aggregate.len",
@@ -338,7 +338,7 @@ void proto_register_turbocell(void)
{ &hf_turbocell_aggregate_unknown2,
{ "Unknown", "turbocell_aggregate.unknown2",
FT_UINT8, BASE_HEX, NULL, 0xF0,
- "have the values 0x4,0xC or 0x8 ", HFILL }
+ "have the values 0x4,0xC or 0x8", HFILL }
},
};