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, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 5465ece255..7a01494328 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -828,7 +828,7 @@ void proto_register_pkix1explicit(void) {
 
     { &hf_pkix1explicit_addressFamily_afn,
       { "Address family(AFN)", "pkix1explicit.addressfamily", FT_UINT16, BASE_DEC, VALS(afn_vals), 0,
-	"Address family(AFN)", HFILL }},
+	NULL, HFILL }},
 
     { &hf_pkix1explicit_addressFamily_safi,
       { "Subsequent Address Family Identifiers (SAFI)", "pkix1explicit.addressfamily.safi", FT_UINT16, BASE_DEC, NULL, 0,
@@ -870,11 +870,11 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.T_extnId", HFILL }},
     { &hf_pkix1explicit_critical,
       { "critical", "pkix1explicit.critical",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pkix1explicit.BOOLEAN", HFILL }},
     { &hf_pkix1explicit_extnValue,
       { "extnValue", "pkix1explicit.extnValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.T_extnValue", HFILL }},
     { &hf_pkix1explicit_p,
       { "p", "pkix1explicit.p",
@@ -898,7 +898,7 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.ValidationParms", HFILL }},
     { &hf_pkix1explicit_seed,
       { "seed", "pkix1explicit.seed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.BIT_STRING", HFILL }},
     { &hf_pkix1explicit_pgenCounter,
       { "pgenCounter", "pkix1explicit.pgenCounter",
@@ -942,7 +942,7 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.IPAddressFamily", HFILL }},
     { &hf_pkix1explicit_addressFamily,
       { "addressFamily", "pkix1explicit.addressFamily",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.T_addressFamily", HFILL }},
     { &hf_pkix1explicit_ipAddressChoice,
       { "ipAddressChoice", "pkix1explicit.ipAddressChoice",
@@ -962,7 +962,7 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.IPAddressOrRange", HFILL }},
     { &hf_pkix1explicit_addressPrefix,
       { "addressPrefix", "pkix1explicit.addressPrefix",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.IPAddress", HFILL }},
     { &hf_pkix1explicit_addressRange,
       { "addressRange", "pkix1explicit.addressRange",
@@ -970,11 +970,11 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.IPAddressRange", HFILL }},
     { &hf_pkix1explicit_min,
       { "min", "pkix1explicit.min",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.IPAddress", HFILL }},
     { &hf_pkix1explicit_max,
       { "max", "pkix1explicit.max",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.IPAddress", HFILL }},
     { &hf_pkix1explicit_asnum,
       { "asnum", "pkix1explicit.asnum",