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-fcswils.c b/epan/dissectors/packet-fcswils.c
index 31881cb04b..db31f0414a 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -1939,7 +1939,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_flags,
           {"Flag", "swils.elp.flag",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_r_a_tov,
           {"R_A_TOV", "swils.elp.ratov",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -1948,10 +1948,10 @@ proto_register_fcswils (void)
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_req_epn,
           {"Req Eport Name", "swils.elp.reqepn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_req_esn,
           {"Req Switch Name", "swils.elp.reqesn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_clsf_svcp,
           {"Class F Svc Param", "swils.elp.clsfp",
            FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -1975,19 +1975,19 @@ proto_register_fcswils (void)
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls2_svcp,
           {"Class 2 Svc Param", "swils.elp.cls2p",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls2_rcvsz,
           {"Class 2 Frame Size", "swils.elp.cls1rsz",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls3_svcp,
           {"Class 3 Svc Param", "swils.elp.cls3p",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls3_rcvsz,
           {"Class 3 Frame Size", "swils.elp.cls1rsz",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_isl_fc_mode,
           {"ISL Flow Ctrl Mode", "swils.elp.fcmode",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_fcplen,
           {"Flow Ctrl Param Len", "swils.elp.fcplen",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2014,13 +2014,13 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_switch_name,
           {"Switch Name", "swils.efp.sname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_mcast_grpno,
           {"Mcast Grp#", "swils.efp.mcastno",
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_alias_token,
           {"Alias Token", "swils.efp.aliastok",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_record_len,
           {"Record Len", "swils.efp.recordlen",
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2032,18 +2032,18 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_pswitch_name,
           {"Principal Switch Name", "swils.efp.psname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_dia_switch_name,
           {"Switch Name", "swils.dia.sname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rdi_payload_len,
           {"Payload Len", "swils.rdi.len",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rdi_req_sname,
           {"Req Switch Name", "swils.rdi.reqsn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_fspfh_cmd,
-          {"Command: ", "swils.fspf.cmd",
+          {"Command:", "swils.fspf.cmd",
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_fspfh_rev,
           {"Version", "swils.fspf.ver",
@@ -2059,10 +2059,10 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_fspfh_auth,
           {"Authentication", "swils.fspf.auth",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_hlo_options,
           {"Options", "swils.hlo.options",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_hlo_hloint,
           {"Hello Interval (secs)", "swils.hlo.hloint",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2089,7 +2089,7 @@ proto_register_fcswils (void)
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ldrec_linkid,
           {"Link ID", "swils.ldr.linkid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ldrec_out_pidx,
           {"Output Port Idx", "swils.ldr.out_portidx",
            FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}},
@@ -2110,7 +2110,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, VALS (fc_swils_rscn_addrfmt_val), 0x0F, NULL, HFILL}},
         { &hf_swils_rscn_affectedport,
           {"Affected Port ID", "swils.rscn.affectedport",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_detectfn,
           {"Detection Function", "swils.rscn.detectfn",
            FT_UINT32, BASE_HEX, VALS (fc_swils_rscn_detectfn_val), 0x0, NULL, HFILL}},
@@ -2119,28 +2119,28 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_portid,
           {"Port Id", "swils.rscn.portid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_pwwn,
           {"Port WWN", "swils.rscn.pwwn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_nwwn,
           {"Node WWN", "swils.rscn.nwwn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_esc_swvendorid,
           {"Switch Vendor ID", "swils.esc.swvendor",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_esc_pdesc_vendorid,
           {"Vendor ID", "swils.esc.vendorid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_esc_protocolid,
           {"Protocol ID", "swils.esc.protocol",
            FT_UINT16, BASE_HEX, VALS (fc_swils_esc_protocol_val), 0x0, NULL, HFILL}},
         { &hf_swils_zone_activezonenm,
           {"Active Zoneset Name", "swils.mr.activezonesetname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_objname,
           {"Zone Object Name", "swils.zone.zoneobjname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_objtype,
           {"Zone Object Type", "swils.zone.zoneobjtype",
            FT_UINT8, BASE_HEX, VALS (fc_swils_zoneobj_type_val), 0x0, NULL, HFILL}},
@@ -2152,7 +2152,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_mbrid,
           {"Member Identifier", "swils.zone.mbrid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_status,
           {"Zone Command Status", "swils.zone.status",
            FT_UINT8, BASE_HEX, VALS (fc_swils_mr_rsp_val), 0x0, 
@@ -2169,7 +2169,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, VALS (fc_swils_sfc_op_val), 0x0, NULL, HFILL}},
         { &hf_swils_sfc_zonenm,
           {"Zone Set Name", "swils.sfc.zonename",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rjt,
           {"Reason Code", "swils.rjt.reason",
            FT_UINT8, BASE_HEX, VALS (fc_swils_rjt_val), 0x0, NULL, HFILL}},
@@ -2181,7 +2181,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_mbrid_lun,
           {"LUN", "swils.zone.lun",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_rev,
           {"Revision", "swils.ess.revision",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2196,16 +2196,16 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_vendorname,
           {"Vendor Name", "swils.ess.vendorname",
-           FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_modelname,
           {"Model Name", "swils.ess.modelname",
-           FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_relcode,
           {"Release Code", "swils.ess.relcode",
-           FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_vendorspecific,
           {"Vendor Specific", "swils.ess.vendorspecific",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_cap_type,
           {"Type", "swils.ess.capability.type",
            FT_UINT8, BASE_DEC, VALS (fc_ct_gstype_vals), 0x0, NULL, HFILL}},
@@ -2283,10 +2283,10 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_cap_t10,
           {"T10 Vendor ID", "swils.ess.capability.t10id",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_cap_vendorobj,
           {"Vendor-Specific Info", "swils.ess.capability.vendorobj",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_rev,
           {"Revision", "swils.mrra.revision",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2295,10 +2295,10 @@ proto_register_fcswils (void)
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_vendorid,
           {"Vendor ID", "swils.mrra.vendorid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_vendorinfo,
           {"Vendor-Specific Info", "swils.mrra.vendorinfo",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_reply,
           {"MRRA Response", "swils.mrra.reply",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},