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

diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index db19ea9f1c..be02978df6 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -3200,7 +3200,7 @@ void proto_register_edonkey(void) {
     static hf_register_info hf[] = {
         { &hf_edonkey_message,
             { "eDonkey Message", "edonkey.message",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Message", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_protocol,
             { "Protocol", "edonkey.protocol",
                 FT_UINT8, BASE_HEX, VALS(edonkey_protocols), 0, "eDonkey Protocol", HFILL } },
@@ -3212,25 +3212,25 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_HEX, NULL, 0, "eDonkey Message Type", HFILL } },
         { &hf_edonkey_client_hash,
             { "Client Hash", "edonkey.client_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey Client Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Client Hash", HFILL } },
         { &hf_edonkey_server_hash,
             { "Server Hash", "edonkey.server_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey Server Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Server Hash", HFILL } },
         { &hf_edonkey_file_hash,
             { "File Hash", "edonkey.file_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey File Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey File Hash", HFILL } },
         { &hf_edonkey_client_id,
             { "Client ID", "edonkey.clientid",
-                FT_IPv4, BASE_DEC, NULL, 0, "eDonkey Client ID", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "eDonkey Client ID", HFILL } },
         { &hf_edonkey_ip,
             { "IP", "edonkey.ip",
-                FT_IPv4, BASE_DEC, NULL, 0, "eDonkey IP", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "eDonkey IP", HFILL } },
         { &hf_edonkey_port,
             { "Port", "edonkey.port",
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Port", HFILL } },
         { &hf_edonkey_metatag,
             { "eDonkey Meta Tag", "edonkey.metatag",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Meta Tag", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_metatag_type,
             { "Meta Tag Type", "edonkey.metatag.type",
                 FT_UINT8, BASE_HEX, NULL, 0, "eDonkey Meta Tag Type", HFILL } },
@@ -3245,10 +3245,10 @@ void proto_register_edonkey(void) {
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Meta Tag Name Size", HFILL } },
         { &hf_edonkey_search,
             { "eDonkey Search", "edonkey.search",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Search", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_hash,
             { "Hash", "edonkey.hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Hash", HFILL } },
         { &hf_edonkey_string,
             { "String", "edonkey.string",
                 FT_STRING, BASE_NONE, NULL, 0, "eDonkey String", HFILL } },
@@ -3260,31 +3260,31 @@ void proto_register_edonkey(void) {
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Part Count", HFILL } },
         { &hf_edonkey_file_status,
             { "File Status", "edonkey.file_status",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey File Status", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey File Status", HFILL } },
         { &hf_edonkey_directory,
             { "Directory", "edonkey.directory",
                 FT_STRING, BASE_NONE, NULL, 0, "eDonkey Directory", HFILL } },
         { &hf_edonkey_fileinfo,
             { "eDonkey File Info", "edonkey.fileinfo",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey File Info", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_serverinfo,
             { "eDonkey Server Info", "edonkey.serverinfo",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Server Info", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_clientinfo,
             { "eDonkey Client Info", "edonkey.clientinfo",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Client Info", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_emule_public_key,
             { "Public Key", "edonkey.emule.public_key",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule Public Key", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule Public Key", HFILL } },
         { &hf_emule_signature,
             { "Signature", "edonkey.emule.signature",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule Signature", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule Signature", HFILL } },
         { &hf_emule_aich_partnum,
             { "Part Number", "edonkey.emule.aich_partnum",
                 FT_UINT16, BASE_DEC, NULL, 0, "eMule AICH Part Number", HFILL } },
         { &hf_emule_aich_root_hash,
             { "AICH Root Hash", "edonkey.emule.aich_root_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule AICH Root Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule AICH Root Hash", HFILL } },
         { &hf_emule_aich_hash_entry,
             { "AICH Hash Entry", "emule_aich_hash_entry",
                 FT_NONE, BASE_NONE, NULL, 0, "eMule AICH Hash Entry", HFILL } },
@@ -3293,10 +3293,10 @@ void proto_register_edonkey(void) {
                 FT_UINT16, BASE_HEX, NULL, 0, "eMule AICH Hash ID", HFILL } },
         { &hf_emule_aich_hash,
             { "AICH Hash", "edonkey.emule.aich_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule AICH Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule AICH Hash", HFILL } },
         { &hf_emule_multipacket_entry,
             { "eMule MultiPacket Entry", "edonkey.emule.multipacket_entry",
-                FT_NONE, BASE_NONE, NULL, 0, "eMule MultiPacket Entry", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_emule_multipacket_opcode,
             { "MultiPacket Opcode", "edonkey.emule.multipacket_opcode",
                 FT_UINT8, BASE_HEX, NULL, 0, "eMule MultiPacket Opcode", HFILL } },
@@ -3311,7 +3311,7 @@ void proto_register_edonkey(void) {
                 FT_NONE, BASE_NONE, NULL, 0, "eMule Compressed Data", HFILL } },
         { &hf_overnet_peer,
             { "Overnet Peer", "edonkey.overnet.peer",
-                FT_NONE, BASE_NONE, NULL, 0, "Overnet Peer", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia,
             { "Kademlia Packet", "edonkey.kademlia",
                 FT_UINT8, BASE_HEX, NULL, 0, "Kademlia Packet Type", HFILL } },
@@ -3320,34 +3320,34 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_DEC_HEX, NULL, 0, "Kademlia Peer Type", HFILL } },
         { &hf_kademlia_peer,
             { "Kademlia Peer", "edonkey.kademlia.peer",
-                FT_NONE, BASE_NONE, NULL, 0, "Kademlia Peer", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_peer_id,
             { "Peer ID", "edonkey.kademlia.peer.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Peer ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Peer ID", HFILL } },
         { &hf_kademlia_hash,
             { "Kademlia Hash", "edonkey.kademlia.hash",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Hash", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_file_id,
             { "File ID", "edonkey.kademlia.file.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia File ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia File ID", HFILL } },
         { &hf_kademlia_keyword_hash,
             { "Keyword Hash", "edonkey.kademlia.keyword.hash",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Keyword Hash", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Keyword Hash", HFILL } },
         { &hf_kademlia_recipients_id,
             { "Recipient's ID", "edonkey.kademlia.recipients.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Recipient's ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Recipient's ID", HFILL } },
         { &hf_kademlia_sender_id,
             { "Sender ID", "edonkey.kademlia.sender.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Sender ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Sender ID", HFILL } },
         { &hf_kademlia_target_id,
             { "Target ID", "edonkey.kademlia.target.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Target ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Target ID", HFILL } },
         { &hf_kademlia_distance,
             { "XOR Distance", "edonkey.kademlia.distance",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia XOR Distance", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia XOR Distance", HFILL } },
         { &hf_kademlia_version,
             { "Kad Version", "edonkey.kademlia.version",
-                FT_UINT8, BASE_DEC_HEX, NULL, 0, "Kad Version", HFILL } },
+                FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_tag_float,
             { "Tag Value (Float)", "edonkey.kademlia.tag.value.float",
                 FT_FLOAT, BASE_NONE, NULL, 0, "Float Tag Value", HFILL } },
@@ -3359,7 +3359,7 @@ void proto_register_edonkey(void) {
                 FT_UINT32, BASE_DEC_HEX, NULL, 0, "UINT32 Tag Value", HFILL } },
         { &hf_kademlia_tag_ipv4,
             { "Tag Value (IPv4)", "edonkey.kademlia.tag.value.ipv4",
-                FT_IPv4, BASE_DEC, NULL, 0, "UINT32 Tag Value (IPv4)", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "UINT32 Tag Value (IPv4)", HFILL } },
         { &hf_kademlia_tag_uint16,
             { "Tag Value (UINT16)", "edonkey.kademlia.tag.value.uint16",
                 FT_UINT16, BASE_DEC_HEX, NULL, 0, "UINT16 Tag Value", HFILL } },
@@ -3368,19 +3368,19 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_DEC_HEX, NULL, 0, "UINT8 Tag Value", HFILL } },
         { &hf_kademlia_tag_hash,
             { "Tag Value (HASH)", "edonkey.kademlia.tag.value.hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "HASH Tag Value", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "HASH Tag Value", HFILL } },
         { &hf_kademlia_tag_string,
             { "Tag Value (String)", "edonkey.kademlia.tag.value.string",
-                FT_STRING, BASE_HEX, NULL, 0, "String Tag Value", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "String Tag Value", HFILL } },
         { &hf_kademlia_tag_bsob,
             { "Tag Value (BSOB)", "edonkey.kademlia.tag.value.bsob",
-                FT_BYTES, BASE_HEX, NULL, 0, "BSOB Tag Value", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "BSOB Tag Value", HFILL } },
         { &hf_kademlia_udp_port,
             { "UDP Port", "edonkey.kademlia.udp_port",
                 FT_UINT16, BASE_DEC, NULL, 0, "Kademlia UDP Port", HFILL } },
         { &hf_kademlia_ip,
             { "IP", "edonkey.kademlia.ip",
-                FT_IPv4, BASE_DEC, NULL, 0, "eDonkey IP", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "eDonkey IP", HFILL } },
         { &hf_kademlia_tcp_port,
             { "TCP Port", "edonkey.kademlia.tcp_port",
                 FT_UINT16, BASE_DEC, NULL, 0, "Kademlia TCP Port", HFILL } },