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

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index ed887a748d..25ebb9ad4d 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -4455,35 +4455,35 @@ void proto_register_cmip(void) {
     { &hf_cmip_actionType_OID,
       { "actionType", "cmip.actionType_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "actionType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventType_OID,
       { "eventType", "cmip.eventType_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "eventType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeId_OID,
       { "attributeId", "cmip.attributeId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "attributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_errorId_OID,
       { "errorId", "cmip.errorId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "errorId", HFILL }},
+        NULL, HFILL }},
    { &hf_DiscriminatorConstruct,
       { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_Destination,
       { "Destination", "cmip.Destination",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_NameBinding,
       { "NameBinding", "cmip.NameBinding",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ObjectClass,
       { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "", HFILL }},
+        NULL, HFILL }},
 
 
 /*--- Included file: packet-cmip-hfarr.c ---*/
@@ -4542,7 +4542,7 @@ void proto_register_cmip(void) {
         "cmip.AvailabilityStatus", HFILL }},
     { &hf_cmip_BackedUpStatus_PDU,
       { "BackedUpStatus", "cmip.BackedUpStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.BackedUpStatus", HFILL }},
     { &hf_cmip_BackUpDestinationList_PDU,
       { "BackUpDestinationList", "cmip.BackUpDestinationList",
@@ -4558,7 +4558,7 @@ void proto_register_cmip(void) {
         "cmip.CapacityAlarmThreshold", HFILL }},
     { &hf_cmip_ConfirmedMode_PDU,
       { "ConfirmedMode", "cmip.ConfirmedMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.ConfirmedMode", HFILL }},
     { &hf_cmip_ControlStatus_PDU,
       { "ControlStatus", "cmip.ControlStatus",
@@ -4722,7 +4722,7 @@ void proto_register_cmip(void) {
         "cmip.TrendIndication", HFILL }},
     { &hf_cmip_UnknownStatus_PDU,
       { "UnknownStatus", "cmip.UnknownStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.UnknownStatus", HFILL }},
     { &hf_cmip_UsageState_PDU,
       { "UsageState", "cmip.UsageState",
@@ -5066,7 +5066,7 @@ void proto_register_cmip(void) {
         "cmip.DistinguishedName", HFILL }},
     { &hf_cmip_nonSpecificForm,
       { "nonSpecificForm", "cmip.nonSpecificForm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.OCTET_STRING", HFILL }},
     { &hf_cmip_localDistinguishedName,
       { "localDistinguishedName", "cmip.localDistinguishedName",
@@ -5126,11 +5126,11 @@ void proto_register_cmip(void) {
         "cmip.EXTERNAL", HFILL }},
     { &hf_cmip_protocolVersion,
       { "protocolVersion", "cmip.protocolVersion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.ProtocolVersion", HFILL }},
     { &hf_cmip_functionalUnits,
       { "functionalUnits", "cmip.functionalUnits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.FunctionalUnits", HFILL }},
     { &hf_cmip_cmipUserInfoaccessControl,
       { "accessControl", "cmip.accessControl",
@@ -5242,7 +5242,7 @@ void proto_register_cmip(void) {
         "cmip.T_managementExtensionidentifier", HFILL }},
     { &hf_cmip_significance,
       { "significance", "cmip.significance",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.BOOLEAN", HFILL }},
     { &hf_cmip_information,
       { "information", "cmip.information",
@@ -5406,7 +5406,7 @@ void proto_register_cmip(void) {
         "cmip.WeekMask_item", HFILL }},
     { &hf_cmip_daysOfWeek,
       { "daysOfWeek", "cmip.daysOfWeek",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.T_daysOfWeek", HFILL }},
     { &hf_cmip_intervalsOfDay,
       { "intervalsOfDay", "cmip.intervalsOfDay",
@@ -5535,59 +5535,59 @@ void proto_register_cmip(void) {
     { &hf_cmip_FunctionalUnits_multipleObjectSelection,
       { "multipleObjectSelection", "cmip.multipleObjectSelection",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_filter,
       { "filter", "cmip.filter",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_multipleReply,
       { "multipleReply", "cmip.multipleReply",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_extendedService,
       { "extendedService", "cmip.extendedService",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_cancelGet,
       { "cancelGet", "cmip.cancelGet",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version1,
       { "version1", "cmip.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version2,
       { "version2", "cmip.version2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_sunday,
       { "sunday", "cmip.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_monday,
       { "monday", "cmip.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_tuesday,
       { "tuesday", "cmip.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_wednesday,
       { "wednesday", "cmip.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_thursday,
       { "thursday", "cmip.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_friday,
       { "friday", "cmip.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_saturday,
       { "saturday", "cmip.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
 #line 193 "packet-cmip-template.c"