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

diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 870e446462..35c5fb7a6a 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -474,98 +474,98 @@ proto_register_fip(void)
          */
         { &hf_fip_ver,
           {"Version", "fip.ver", FT_UINT8, BASE_DEC,
-            NULL, 0xf0, "", HFILL}},
+            NULL, 0xf0, NULL, HFILL}},
         { &hf_fip_op,
           {"Opcode", "fip.opcode", FT_UINT16, BASE_HEX,
-           VALS(&fip_opcodes), 0, "", HFILL}},
+           VALS(&fip_opcodes), 0, NULL, HFILL}},
         { &hf_fip_disc_subcode,
           {"Discovery Subcode", "fip.disc_subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_disc_subcodes), 0, "", HFILL}},
+           VALS(&fip_disc_subcodes), 0, NULL, HFILL}},
         { &hf_fip_ls_subcode,
           {"Link Service Subcode", "fip.ls.subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_ls_subcodes), 0, "", HFILL}},
+           VALS(&fip_ls_subcodes), 0, NULL, HFILL}},
         { &hf_fip_ctrl_subcode,
           {"Control Subcode", "fip.ctrl_subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_ctrl_subcodes), 0, "", HFILL}},
+           VALS(&fip_ctrl_subcodes), 0, NULL, HFILL}},
         { &hf_fip_vlan_subcode,
           {"VLAN Subcode", "fip.vlan_subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_vlan_subcodes), 0, "", HFILL}},
+           VALS(&fip_vlan_subcodes), 0, NULL, HFILL}},
         { &hf_fip_hex_subcode,
           {"Unknown Subcode", "fip.subcode", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_fip_dlen,
           {"Length of Descriptors (words)", "fip.dl_len", FT_UINT16, BASE_DEC,
-            NULL, 0, "", HFILL}},
+            NULL, 0, NULL, HFILL}},
         { &hf_fip_flags,
           {"Flags", "fip.flags", FT_UINT16, BASE_HEX,
-            NULL, 0, "", HFILL}},
+            NULL, 0, NULL, HFILL}},
         { &hf_fip_flag_fpma,
           {"Fabric Provided MAC addr", "fip.flags.fpma", FT_BOOLEAN, 16,
-            NULL, FIP_FL_FPMA, "", HFILL}},
+            NULL, FIP_FL_FPMA, NULL, HFILL}},
         { &hf_fip_flag_spma,
           {"Server Provided MAC addr", "fip.flags.spma", FT_BOOLEAN, 16,
-            NULL, FIP_FL_SPMA, "", HFILL}},
+            NULL, FIP_FL_SPMA, NULL, HFILL}},
         { &hf_fip_flag_avail,
           {"Available", "fip.flags.available", FT_BOOLEAN, 16,
-            NULL, FIP_FL_AVAIL, "", HFILL}},
+            NULL, FIP_FL_AVAIL, NULL, HFILL}},
         { &hf_fip_flag_sol,
           {"Solicited", "fip.flags.sol", FT_BOOLEAN, 16,
-            NULL, FIP_FL_SOL, "", HFILL}},
+            NULL, FIP_FL_SOL, NULL, HFILL}},
         { &hf_fip_flag_fport,
           {"F_Port", "fip.flags.fport", FT_BOOLEAN, 16,
-            NULL, FIP_FL_FPORT, "", HFILL}},
+            NULL, FIP_FL_FPORT, NULL, HFILL}},
         { &hf_fip_desc_type,
           {"Descriptor Type", "fip.desc_type", FT_UINT8, BASE_HEX,
-            VALS(&fip_desc_types), 0, "", HFILL}},
+            VALS(&fip_desc_types), 0, NULL, HFILL}},
         { &hf_fip_desc_len,
           {"Descriptor Length (words)", "fip.desc_len", FT_UINT8, BASE_DEC,
-            NULL, 0, "", HFILL}},
+            NULL, 0, NULL, HFILL}},
         /*
          * Various descriptor fields.
          */
         { &hf_fip_desc_pri,
-          {"Priority", "fip.pri", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL}},
+          {"Priority", "fip.pri", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_mac,
-          {"MAC Address", "fip.mac", FT_ETHER, 0, NULL, 0, "", HFILL}},
+          {"MAC Address", "fip.mac", FT_ETHER, 0, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_map,
-          {"FC-MAP-OUI", "fip.map", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}},
+          {"FC-MAP-OUI", "fip.map", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_name,
-          {"Switch or Node Name", "fip.name", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Switch or Node Name", "fip.name", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fab_vfid,
-          {"VFID Descriptor", "fip.fab.vfid", FT_STRING, BASE_DEC, NULL,
-            0, "", HFILL}},
+          {"VFID Descriptor", "fip.fab.vfid", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fab_map,
-          {"FC-MAP", "fip.fab.map", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"FC-MAP", "fip.fab.map", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fab_name,
-          {"Fabric Descriptor", "fip.fab.name", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Fabric Descriptor", "fip.fab.name", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fcoe_size,
           {"Max FCoE frame size", "fip.fcoe_size", FT_UINT16, BASE_DEC, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vn_mac,
           {"VN_Port MAC Address", "fip.vn.mac", FT_ETHER, 0, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vn_fid,
           {"VN_Port FC_ID", "fip.vn.fc_id", FT_UINT32, BASE_HEX, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vn_wwpn,
-          {"Port Name", "fip.vn.pwwn", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Port Name", "fip.vn.pwwn", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fka,
           {"FKA_ADV_Period", "fip.fka", FT_UINT32, BASE_DEC, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vend,
-          {"Vendor-ID", "fip.vendor", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}},
+          {"Vendor-ID", "fip.vendor", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_vend_data,
-          {"Vendor-specific data", "fip.vendor.data", FT_BYTES, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Vendor-specific data", "fip.vendor.data", FT_BYTES, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_vlan,
-          {"VLAN", "fip.vlan", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL}},
+          {"VLAN", "fip.vlan", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_unk,
-          {"Unknown Descriptor", "fip.desc", FT_BYTES, BASE_HEX, NULL,
-            0, "", HFILL}}
+          {"Unknown Descriptor", "fip.desc", FT_BYTES, BASE_NONE, NULL,
+            0, NULL, HFILL}}
     };
     static gint *ett[] = {
         &ett_fip,