Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748

1 files changed, 72 insertions, 72 deletions

diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index 0873544502..bbaf3692c5 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -2799,7 +2799,7 @@ void proto_register_h501(void) {
     { &hf_h501_algorithmOIDs,
       { "algorithmOIDs", "h501.algorithmOIDs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_algorithmOIDs", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_algorithmOIDs_item,
       { "algorithmOIDs item", "h501.algorithmOIDs_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2819,47 +2819,47 @@ void proto_register_h501(void) {
     { &hf_h501_serviceUnavailable,
       { "serviceUnavailable", "h501.serviceUnavailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_serviceRedirected,
       { "serviceRedirected", "h501.serviceRedirected",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_security,
       { "security", "h501.security",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_continue,
       { "continue", "h501.continue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_undefined,
       { "undefined", "h501.undefined",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_unknownServiceID,
       { "unknownServiceID", "h501.unknownServiceID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_cannotSupportUsageSpec,
       { "cannotSupportUsageSpec", "h501.cannotSupportUsageSpec",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_neededFeature,
       { "neededFeature", "h501.neededFeature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_genericDataReason,
       { "genericDataReason", "h501.genericDataReason",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_usageUnavailable,
       { "usageUnavailable", "h501.usageUnavailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_unknownUsageSendTo,
       { "unknownUsageSendTo", "h501.unknownUsageSendTo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_reason_01,
       { "reason", "h501.reason",
         FT_UINT32, BASE_DEC, VALS(h501_ServiceReleaseReason_vals), 0,
@@ -2867,19 +2867,19 @@ void proto_register_h501(void) {
     { &hf_h501_outOfService,
       { "outOfService", "h501.outOfService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_maintenance,
       { "maintenance", "h501.maintenance",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_terminated,
       { "terminated", "h501.terminated",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_expired,
       { "expired", "h501.expired",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_descriptorID,
       { "descriptorID", "h501.descriptorID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2907,19 +2907,19 @@ void proto_register_h501(void) {
     { &hf_h501_packetSizeExceeded,
       { "packetSizeExceeded", "h501.packetSizeExceeded",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_illegalID,
       { "illegalID", "h501.illegalID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_hopCountExceeded,
       { "hopCountExceeded", "h501.hopCountExceeded",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_noServiceRelationship,
       { "noServiceRelationship", "h501.noServiceRelationship",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_descriptorInfo,
       { "descriptorInfo", "h501.descriptorInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2935,7 +2935,7 @@ void proto_register_h501(void) {
     { &hf_h501_noDescriptors,
       { "noDescriptors", "h501.noDescriptors",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_sender,
       { "sender", "h501.sender",
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
@@ -2951,7 +2951,7 @@ void proto_register_h501(void) {
     { &hf_h501_descriptorInfo_01,
       { "descriptorInfo", "h501.descriptorInfo",
         FT_UINT32, BASE_DEC, VALS(h501_T_descriptorInfo_vals), 0,
-        "T_descriptorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_descriptor_01,
       { "descriptor", "h501.descriptor",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2959,19 +2959,19 @@ void proto_register_h501(void) {
     { &hf_h501_updateType,
       { "updateType", "h501.updateType",
         FT_UINT32, BASE_DEC, VALS(h501_T_updateType_vals), 0,
-        "T_updateType", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_added,
       { "added", "h501.added",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_deleted,
       { "deleted", "h501.deleted",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_changed,
       { "changed", "h501.changed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_destinationInfo,
       { "destinationInfo", "h501.destinationInfo",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -3027,27 +3027,27 @@ void proto_register_h501(void) {
     { &hf_h501_noMatch,
       { "noMatch", "h501.noMatch",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_needCallInformation,
       { "needCallInformation", "h501.needCallInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_destinationUnavailable,
       { "destinationUnavailable", "h501.destinationUnavailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_aliasesInconsistent,
       { "aliasesInconsistent", "h501.aliasesInconsistent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_resourceUnavailable,
       { "resourceUnavailable", "h501.resourceUnavailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_incompleteAddress,
       { "incompleteAddress", "h501.incompleteAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_reason_05,
       { "reason", "h501.reason",
         FT_UINT32, BASE_DEC, VALS(h501_UsageRejectReason_vals), 0,
@@ -3107,11 +3107,11 @@ void proto_register_h501(void) {
     { &hf_h501_invalidCall,
       { "invalidCall", "h501.invalidCall",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_unavailable,
       { "unavailable", "h501.unavailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_reason_06,
       { "reason", "h501.reason",
         FT_UINT32, BASE_DEC, VALS(h501_UsageIndicationRejectionReason_vals), 0,
@@ -3119,11 +3119,11 @@ void proto_register_h501(void) {
     { &hf_h501_unknownCall,
       { "unknownCall", "h501.unknownCall",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_incomplete,
       { "incomplete", "h501.incomplete",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_accessToken,
       { "accessToken", "h501.accessToken",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -3139,15 +3139,15 @@ void proto_register_h501(void) {
     { &hf_h501_tokenNotValid,
       { "tokenNotValid", "h501.tokenNotValid",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_missingSourceInfo,
       { "missingSourceInfo", "h501.missingSourceInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_missingDestInfo,
       { "missingDestInfo", "h501.missingDestInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_delay,
       { "delay", "h501.delay",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -3159,7 +3159,7 @@ void proto_register_h501(void) {
     { &hf_h501_notSupported,
       { "notSupported", "h501.notSupported",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_unknownMessage,
       { "unknownMessage", "h501.unknownMessage",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -3171,7 +3171,7 @@ void proto_register_h501(void) {
     { &hf_h501_notUnderstood,
       { "notUnderstood", "h501.notUnderstood",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_applicationMessage,
       { "applicationMessage", "h501.applicationMessage",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -3183,27 +3183,27 @@ void proto_register_h501(void) {
     { &hf_h501_securityWrongSyncTime,
       { "securityWrongSyncTime", "h501.securityWrongSyncTime",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_securityReplay,
       { "securityReplay", "h501.securityReplay",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_securityWrongGeneralID,
       { "securityWrongGeneralID", "h501.securityWrongGeneralID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_securityWrongSendersID,
       { "securityWrongSendersID", "h501.securityWrongSendersID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_securityIntegrityFailed,
       { "securityIntegrityFailed", "h501.securityIntegrityFailed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_securityWrongOID,
       { "securityWrongOID", "h501.securityWrongOID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_pattern,
       { "pattern", "h501.pattern",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -3231,7 +3231,7 @@ void proto_register_h501(void) {
     { &hf_h501_range,
       { "range", "h501.range",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_range", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_startOfRange,
       { "startOfRange", "h501.startOfRange",
         FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
@@ -3243,19 +3243,19 @@ void proto_register_h501(void) {
     { &hf_h501_messageType,
       { "messageType", "h501.messageType",
         FT_UINT32, BASE_DEC, VALS(h501_T_messageType_vals), 0,
-        "T_messageType", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_sendAccessRequest,
       { "sendAccessRequest", "h501.sendAccessRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_sendSetup,
       { "sendSetup", "h501.sendSetup",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_nonExistent,
       { "nonExistent", "h501.nonExistent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_callSpecific,
       { "callSpecific", "h501.callSpecific",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -3363,31 +3363,31 @@ void proto_register_h501(void) {
     { &hf_h501_units,
       { "units", "h501.units",
         FT_UINT32, BASE_DEC, VALS(h501_T_units_vals), 0,
-        "T_units", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_seconds,
       { "seconds", "h501.seconds",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_packets,
       { "packets", "h501.packets",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_bytes,
       { "bytes", "h501.bytes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_initial,
       { "initial", "h501.initial",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_minimum,
       { "minimum", "h501.minimum",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_maximum,
       { "maximum", "h501.maximum",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_descriptorInfo_02,
       { "descriptorInfo", "h501.descriptorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -3443,19 +3443,19 @@ void proto_register_h501(void) {
     { &hf_h501_preConnect,
       { "preConnect", "h501.preConnect",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_callInProgress,
       { "callInProgress", "h501.callInProgress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_callEnded,
       { "callEnded", "h501.callEnded",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_registrationLost,
       { "registrationLost", "h501.registrationLost",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_userIdentifier,
       { "userIdentifier", "h501.userIdentifier",
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
@@ -3475,19 +3475,19 @@ void proto_register_h501(void) {
     { &hf_h501_when,
       { "when", "h501.when",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_when", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_never,
       { "never", "h501.never",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_start,
       { "start", "h501.start",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_end,
       { "end", "h501.end",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_period,
       { "period", "h501.period",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -3495,11 +3495,11 @@ void proto_register_h501(void) {
     { &hf_h501_failures,
       { "failures", "h501.failures",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_required,
       { "required", "h501.required",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_required", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_required_item,
       { "required item", "h501.required_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -3507,7 +3507,7 @@ void proto_register_h501(void) {
     { &hf_h501_preferred,
       { "preferred", "h501.preferred",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_preferred", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_preferred_item,
       { "preferred item", "h501.preferred_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -3539,11 +3539,11 @@ void proto_register_h501(void) {
     { &hf_h501_originator,
       { "originator", "h501.originator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_destination,
       { "destination", "h501.destination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h501_nonStandardData,
       { "nonStandardData", "h501.nonStandardData",
         FT_NONE, BASE_NONE, NULL, 0,