diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
| commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-gnm.c | |
| parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (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-gnm.c')
| -rw-r--r-- | epan/dissectors/packet-gnm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index e4a0a3e83f..0d87c0d725 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -2079,7 +2079,7 @@ void proto_register_gnm(void) { "gnm.AlarmStatus", HFILL }}, { &hf_gnm_Boolean_PDU, { "Boolean", "gnm.Boolean", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "gnm.Boolean", HFILL }}, { &hf_gnm_ChannelNumber_PDU, { "ChannelNumber", "gnm.ChannelNumber", @@ -2219,7 +2219,7 @@ void proto_register_gnm(void) { "gnm.TpsInGtpList", HFILL }}, { &hf_gnm_TransmissionCharacteristics_PDU, { "TransmissionCharacteristics", "gnm.TransmissionCharacteristics", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "gnm.TransmissionCharacteristics", HFILL }}, { &hf_gnm_UserLabel_PDU, { "UserLabel", "gnm.UserLabel", @@ -2335,7 +2335,7 @@ void proto_register_gnm(void) { "gnm.UserLabel", HFILL }}, { &hf_gnm_redline, { "redline", "gnm.redline", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "gnm.Boolean", HFILL }}, { &hf_gnm_additionalInfo, { "additionalInfo", "gnm.additionalInfo", @@ -2519,7 +2519,7 @@ void proto_register_gnm(void) { "cmip.ObjectInstance", HFILL }}, { &hf_gnm_redline_01, { "redline", "gnm.redline", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "gnm.BOOLEAN", HFILL }}, { &hf_gnm_name, { "name", "gnm.name", @@ -2720,15 +2720,15 @@ void proto_register_gnm(void) { { &hf_gnm_TransmissionCharacteristics_satellite, { "satellite", "gnm.satellite", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_gnm_TransmissionCharacteristics_dCME, { "dCME", "gnm.dCME", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_gnm_TransmissionCharacteristics_echoControl, { "echoControl", "gnm.echoControl", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-gnm-hfarr.c ---*/ #line 84 "packet-gnm-template.c" |