aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-vnc.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-vnc.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-vnc.c')
-rw-r--r--epan/dissectors/packet-vnc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index 272c3837f2..87b9e27f4d 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -2504,7 +2504,7 @@ proto_register_vnc(void)
{ &hf_vnc_auth_result,
{ "Authentication result", "vnc.auth_result",
FT_UINT32, BASE_DEC, VALS(auth_result_vs), 0x0,
- "Authentication result", HFILL }
+ NULL, HFILL }
},
{ &hf_vnc_auth_error,
{ "Authentication error", "vnc.auth_error",
@@ -2850,7 +2850,7 @@ proto_register_vnc(void)
{ &hf_vnc_rre_bg_pixel,
{ "Background pixel value", "vnc.rre_bg_pixel",
FT_BYTES, BASE_NONE, NULL, 0x0,
- "Background pixel value", HFILL }
+ NULL, HFILL }
},
{ &hf_vnc_rre_subrect_pixel,
@@ -2998,7 +2998,7 @@ proto_register_vnc(void)
{ &hf_vnc_zrle_palette_size,
{ "Palette size", "vnc.zrle_palette_size",
FT_UINT8, BASE_DEC, NULL, 0x7F, /* Lower 7 bits */
- "Palette size", HFILL }
+ NULL, HFILL }
},
{ &hf_vnc_zrle_data,