diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-acp133.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) |
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
Diffstat (limited to 'epan/dissectors/packet-acp133.c')
-rw-r--r-- | epan/dissectors/packet-acp133.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index a12c28e8e3..af3e2ff492 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -1045,7 +1045,7 @@ void proto_register_acp133(void) { "acp133.Community", HFILL }}, { &hf_acp133_OnSupported_PDU, { "OnSupported", "acp133.OnSupported", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "acp133.OnSupported", HFILL }}, { &hf_acp133_ACPLegacyFormat_PDU, { "ACPLegacyFormat", "acp133.ACPLegacyFormat", @@ -1065,7 +1065,7 @@ void proto_register_acp133(void) { "acp133.DistributionCode", HFILL }}, { &hf_acp133_JPEG_PDU, { "JPEG", "acp133.JPEG", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "acp133.JPEG", HFILL }}, { &hf_acp133_MonthlyUKMs_PDU, { "MonthlyUKMs", "acp133.MonthlyUKMs", @@ -1081,7 +1081,7 @@ void proto_register_acp133(void) { "acp133.RIParameters", HFILL }}, { &hf_acp133_Kmid_PDU, { "Kmid", "acp133.Kmid", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "acp133.Kmid", HFILL }}, { &hf_acp133_MLReceiptPolicy_PDU, { "MLReceiptPolicy", "acp133.MLReceiptPolicy", @@ -1121,7 +1121,7 @@ void proto_register_acp133(void) { "x509af.AlgorithmIdentifier", HFILL }}, { &hf_acp133_encrypted, { "encrypted", "acp133.encrypted", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "acp133.BIT_STRING", HFILL }}, { &hf_acp133_Remarks_item, { "Remarks item", "acp133.Remarks_item", @@ -1137,7 +1137,7 @@ void proto_register_acp133(void) { "acp133.T_rIType", HFILL }}, { &hf_acp133_minimize, { "minimize", "acp133.minimize", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "acp133.BOOLEAN", HFILL }}, { &hf_acp133_sHD, { "sHD", "acp133.sHD", @@ -1153,11 +1153,11 @@ void proto_register_acp133(void) { "acp133.PairwiseTag", HFILL }}, { &hf_acp133_ukm, { "ukm", "acp133.ukm", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "acp133.OCTET_STRING", HFILL }}, { &hf_acp133_kmid, { "kmid", "acp133.kmid", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "acp133.Kmid", HFILL }}, { &hf_acp133_edition, { "edition", "acp133.edition", @@ -1241,11 +1241,11 @@ void proto_register_acp133(void) { "acp133.T_conversion_with_loss_prohibited", HFILL }}, { &hf_acp133_further_dl_expansion_allowed, { "further-dl-expansion-allowed", "acp133.further_dl_expansion_allowed", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "acp133.BOOLEAN", HFILL }}, { &hf_acp133_originator_requested_alternate_recipient_removed, { "originator-requested-alternate-recipient-removed", "acp133.originator_requested_alternate_recipient_removed", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "acp133.BOOLEAN", HFILL }}, { &hf_acp133_proof_of_delivery, { "proof-of-delivery", "acp133.proof_of_delivery", @@ -1330,15 +1330,15 @@ void proto_register_acp133(void) { { &hf_acp133_OnSupported_acp127_nn, { "acp127-nn", "acp133.acp127-nn", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_acp133_OnSupported_acp127_pn, { "acp127-pn", "acp133.acp127-pn", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_acp133_OnSupported_acp127_tn, { "acp127-tn", "acp133.acp127-tn", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ #line 71 "packet-acp133-template.c" |