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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 10 insertions, 10 deletions

diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 0be134558a..96f41c6ab8 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -462,7 +462,7 @@ void proto_register_xdmcp(void)
     { &hf_xdmcp_opcode,
       { "Opcode",              "xdmcp.opcode",
       FT_UINT16, BASE_HEX, VALS(opcode_vals), 0,
-      "Opcode", HFILL }
+      NULL, HFILL }
     },
     { &hf_xdmcp_length,
       { "Message length",     "xdmcp.length",
@@ -471,23 +471,23 @@ void proto_register_xdmcp(void)
     },
     { &hf_xdmcp_authentication_name,
       { "Authentication name",     "xdmcp.authentication_name",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Authentication name", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_authorization_name,
       { "Authorization name",     "xdmcp.authorization_name",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Authorization name", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_hostname,
       { "Hostname",     "xdmcp.hostname",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Hostname", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_status,
       { "Status",     "xdmcp.status",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Status", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_session_id,
       { "Session ID",     "xdmcp.session_id",
@@ -497,7 +497,7 @@ void proto_register_xdmcp(void)
     { &hf_xdmcp_display_number,
       { "Display number",     "xdmcp.display_number",
       FT_UINT16, BASE_DEC, NULL, 0,
-      "Display number", HFILL }
+      NULL, HFILL }
     },
   };