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

1 files changed, 23 insertions, 23 deletions

diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index ec9d92bea4..23ef5bb7be 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -241,95 +241,95 @@ void proto_register_kdp(void) {
   static hf_register_info hf[] = {
     { &hf_kdp_version,
       {"KDP version", "kdp.version",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_headerlen,
       {"KDP header len", "kdp.headerlen",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_flags,
       {"KDP flags", "kdp.flags",
-       FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_drop_flag,
       {"KDP DROP Flag", "kdp.flags.drop",
-       FT_BOOLEAN, 8, NULL, KDP_DROP_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_DROP_FLAG, NULL, HFILL}
     },
     { &hf_kdp_syn_flag,
       {"KDP SYN Flag", "kdp.flags.syn",
-       FT_BOOLEAN, 8, NULL, KDP_SYN_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_SYN_FLAG, NULL, HFILL}
     },
     { &hf_kdp_ack_flag,
       {"KDP ACK Flag", "kdp.flags.ack",
-       FT_BOOLEAN, 8, NULL, KDP_ACK_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_ACK_FLAG, NULL, HFILL}
     },
     { &hf_kdp_rst_flag,
       {"KDP RST Flag", "kdp.flags.rst",
-       FT_BOOLEAN, 8, NULL, KDP_RST_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_RST_FLAG, NULL, HFILL}
     },
     { &hf_kdp_bcst_flag,
       {"KDP BCST Flag", "kdp.flags.bcst",
-       FT_BOOLEAN, 8, NULL, KDP_BCST_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_BCST_FLAG, NULL, HFILL}
     },
     { &hf_kdp_dup_flag,
       {"KDP DUP Flag", "kdp.flags.dup",
-       FT_BOOLEAN, 8, NULL, KDP_DUP_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_DUP_FLAG, NULL, HFILL}
     },
     { &hf_kdp_errors,
       {"KDP errors", "kdp.errors",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_destflowid,
       { "DestFlowID", "kdp.destflowid",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_srcflowid,
       { "SrcFlowID", "kdp.srcflowid",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_sequence,
       { "Sequence", "kdp.sequence",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_ack,
       { "Ack", "kdp.ack",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_maxsegmentsize,
       { "MaxSegmentSize", "kdp.maxsegmentsize",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_optionnumber,
       { "Option Number", "kdp.optionnumber",
-	FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_optionlen,
       { "Option Len", "kdp.option",
-	FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_option1,
       { "Option1 - Max Window", "kdp.option1",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_option2,
       { "Option2 - TCP Fraction", "kdp.option2",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_fragment,
       { "Fragment", "kdp.fragment",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_fragtotal,
       { "FragTotal", "kdp.fragtotal",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_body,
       { "Encrypted Body", "kdp.body",
-	FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_xml_body,
       { "XML Body", "kdp.body",
-	FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
+	FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}
     }
   };