From Kovarththanan Rajaratnam via bug 3548:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 18 Jun 2009 21:30:42 +0000 (21:30 +0000)
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 18 Jun 2009 21:30:42 +0000 (21:30 +0000)
(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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7

682 files changed:
epan/dissectors/packet-2dparityfec.c
epan/dissectors/packet-3com-njack.c
epan/dissectors/packet-3com-xns.c
epan/dissectors/packet-3g-a11.c
epan/dissectors/packet-9p.c
epan/dissectors/packet-aarp.c
epan/dissectors/packet-acn.c
epan/dissectors/packet-acp133.c
epan/dissectors/packet-acse.c
epan/dissectors/packet-actrace.c
epan/dissectors/packet-afp.c
epan/dissectors/packet-afs.c
epan/dissectors/packet-agentx.c
epan/dissectors/packet-aim-admin.c
epan/dissectors/packet-aim-bos.c
epan/dissectors/packet-aim-buddylist.c
epan/dissectors/packet-aim-generic.c
epan/dissectors/packet-aim-icq.c
epan/dissectors/packet-aim-location.c
epan/dissectors/packet-aim-messaging.c
epan/dissectors/packet-aim-signon.c
epan/dissectors/packet-aim-ssi.c
epan/dissectors/packet-aim-sst.c
epan/dissectors/packet-aim.c
epan/dissectors/packet-airopeek.c
epan/dissectors/packet-ajp13.c
epan/dissectors/packet-alcap.c
epan/dissectors/packet-amr.c
epan/dissectors/packet-ansi_637.c
epan/dissectors/packet-ansi_683.c
epan/dissectors/packet-ansi_a.c
epan/dissectors/packet-ansi_map.c
epan/dissectors/packet-ansi_tcap.c
epan/dissectors/packet-aodv.c
epan/dissectors/packet-aoe.c
epan/dissectors/packet-ap1394.c
epan/dissectors/packet-app-pkix-cert.c
epan/dissectors/packet-arcnet.c
epan/dissectors/packet-armagetronad.c
epan/dissectors/packet-artnet.c
epan/dissectors/packet-aruba-adp.c
epan/dissectors/packet-asap.c
epan/dissectors/packet-ascend.c
epan/dissectors/packet-atalk.c
epan/dissectors/packet-atm.c
epan/dissectors/packet-auto_rp.c
epan/dissectors/packet-ax4000.c
epan/dissectors/packet-ayiya.c
epan/dissectors/packet-bacapp.c
epan/dissectors/packet-bacnet.c
epan/dissectors/packet-banana.c
epan/dissectors/packet-bat.c
epan/dissectors/packet-beep.c
epan/dissectors/packet-ber.c
epan/dissectors/packet-bfd.c
epan/dissectors/packet-bgp.c
epan/dissectors/packet-bittorrent.c
epan/dissectors/packet-bjnp.c
epan/dissectors/packet-bootp.c
epan/dissectors/packet-bootparams.c
epan/dissectors/packet-bpdu.c
epan/dissectors/packet-brdwlk.c
epan/dissectors/packet-bssap.c
epan/dissectors/packet-bssgp.c
epan/dissectors/packet-bthci_acl.c
epan/dissectors/packet-bthci_cmd.c
epan/dissectors/packet-bthci_evt.c
epan/dissectors/packet-bthci_sco.c
epan/dissectors/packet-btl2cap.c
epan/dissectors/packet-btrfcomm.c
epan/dissectors/packet-btsdp.c
epan/dissectors/packet-bvlc.c
epan/dissectors/packet-calcappprotocol.c
epan/dissectors/packet-camel.c
epan/dissectors/packet-capwap.c
epan/dissectors/packet-cast.c
epan/dissectors/packet-catapult-dct2000.c
epan/dissectors/packet-cdp.c
epan/dissectors/packet-cdt.c
epan/dissectors/packet-cgmp.c
epan/dissectors/packet-charging_ase.c
epan/dissectors/packet-chdlc.c
epan/dissectors/packet-cigi.c
epan/dissectors/packet-cimd.c
epan/dissectors/packet-cip.c
epan/dissectors/packet-cisco-erspan.c
epan/dissectors/packet-cisco-sm.c
epan/dissectors/packet-clearcase.c
epan/dissectors/packet-clnp.c
epan/dissectors/packet-cmip.c
epan/dissectors/packet-cmp.c
epan/dissectors/packet-cmpp.c
epan/dissectors/packet-cms.c
epan/dissectors/packet-componentstatus.c
epan/dissectors/packet-cops.c
epan/dissectors/packet-cosine.c
epan/dissectors/packet-cpfi.c
epan/dissectors/packet-cpha.c
epan/dissectors/packet-crmf.c
epan/dissectors/packet-ctdb.c
epan/dissectors/packet-cups.c
epan/dissectors/packet-dap.c
epan/dissectors/packet-data.c
epan/dissectors/packet-dcc.c
epan/dissectors/packet-dccp.c
epan/dissectors/packet-dcerpc-atsvc.c
epan/dissectors/packet-dcerpc-bossvr.c
epan/dissectors/packet-dcerpc-browser.c
epan/dissectors/packet-dcerpc-budb.c
epan/dissectors/packet-dcerpc-butc.c
epan/dissectors/packet-dcerpc-cds_clerkserver.c
epan/dissectors/packet-dcerpc-cds_solicit.c
epan/dissectors/packet-dcerpc-conv.c
epan/dissectors/packet-dcerpc-cprpc_server.c
epan/dissectors/packet-dcerpc-dfs.c
epan/dissectors/packet-dcerpc-dnsserver.c
epan/dissectors/packet-dcerpc-drsuapi.c
epan/dissectors/packet-dcerpc-dssetup.c
epan/dissectors/packet-dcerpc-dtsprovider.c
epan/dissectors/packet-dcerpc-dtsstime_req.c
epan/dissectors/packet-dcerpc-efs.c
epan/dissectors/packet-dcerpc-epm.c
epan/dissectors/packet-dcerpc-eventlog.c
epan/dissectors/packet-dcerpc-fileexp.c
epan/dissectors/packet-dcerpc-fldb.c
epan/dissectors/packet-dcerpc-frsapi.c
epan/dissectors/packet-dcerpc-frsrpc.c
epan/dissectors/packet-dcerpc-ftserver.c
epan/dissectors/packet-dcerpc-icl_rpc.c
epan/dissectors/packet-dcerpc-initshutdown.c
epan/dissectors/packet-dcerpc-krb5rpc.c
epan/dissectors/packet-dcerpc-llb.c
epan/dissectors/packet-dcerpc-lsa.c
epan/dissectors/packet-dcerpc-mapi.c
epan/dissectors/packet-dcerpc-messenger.c
epan/dissectors/packet-dcerpc-mgmt.c
epan/dissectors/packet-dcerpc-netlogon.c
epan/dissectors/packet-dcerpc-nspi.c
epan/dissectors/packet-dcerpc-nt.c
epan/dissectors/packet-dcerpc-pnp.c
epan/dissectors/packet-dcerpc-rdaclif.c
epan/dissectors/packet-dcerpc-rep_proc.c
epan/dissectors/packet-dcerpc-rfr.c
epan/dissectors/packet-dcerpc-roverride.c
epan/dissectors/packet-dcerpc-rpriv.c
epan/dissectors/packet-dcerpc-rras.c
epan/dissectors/packet-dcerpc-rs_acct.c
epan/dissectors/packet-dcerpc-rs_attr.c
epan/dissectors/packet-dcerpc-rs_attr_schema.c
epan/dissectors/packet-dcerpc-rs_bind.c
epan/dissectors/packet-dcerpc-rs_misc.c
epan/dissectors/packet-dcerpc-rs_pgo.c
epan/dissectors/packet-dcerpc-rs_plcy.c
epan/dissectors/packet-dcerpc-rs_prop_acct.c
epan/dissectors/packet-dcerpc-rs_prop_acl.c
epan/dissectors/packet-dcerpc-rs_prop_attr.c
epan/dissectors/packet-dcerpc-rs_prop_pgo.c
epan/dissectors/packet-dcerpc-rs_prop_plcy.c
epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
epan/dissectors/packet-dcerpc-rs_repadm.c
epan/dissectors/packet-dcerpc-rs_replist.c
epan/dissectors/packet-dcerpc-rs_repmgr.c
epan/dissectors/packet-dcerpc-rs_unix.c
epan/dissectors/packet-dcerpc-rsec_login.c
epan/dissectors/packet-dcerpc-samr.c
epan/dissectors/packet-dcerpc-secidmap.c
epan/dissectors/packet-dcerpc-spoolss.c
epan/dissectors/packet-dcerpc-srvsvc.c
epan/dissectors/packet-dcerpc-svcctl.c
epan/dissectors/packet-dcerpc-tapi.c
epan/dissectors/packet-dcerpc-tkn4int.c
epan/dissectors/packet-dcerpc-trksvr.c
epan/dissectors/packet-dcerpc-ubikdisk.c
epan/dissectors/packet-dcerpc-ubikvote.c
epan/dissectors/packet-dcerpc-update.c
epan/dissectors/packet-dcerpc-winreg.c
epan/dissectors/packet-dcerpc-wkssvc.c
epan/dissectors/packet-dcerpc-wzcsvc.c
epan/dissectors/packet-dcerpc.c
epan/dissectors/packet-dcom-dispatch.c
epan/dissectors/packet-dcom-oxid.c
epan/dissectors/packet-dcom-remact.c
epan/dissectors/packet-dcom-remunkn.c
epan/dissectors/packet-dcom-sysact.c
epan/dissectors/packet-dcom.c
epan/dissectors/packet-dcp-etsi.c
epan/dissectors/packet-ddtp.c
epan/dissectors/packet-dec-bpdu.c
epan/dissectors/packet-dec-dnart.c
epan/dissectors/packet-dhcp-failover.c
epan/dissectors/packet-dhcpv6.c
epan/dissectors/packet-diameter.c
epan/dissectors/packet-diameter_3gpp.c
epan/dissectors/packet-disp.c
epan/dissectors/packet-distcc.c
epan/dissectors/packet-dlm3.c
epan/dissectors/packet-dmp.c
epan/dissectors/packet-dnp.c
epan/dissectors/packet-dns.c
epan/dissectors/packet-dop.c
epan/dissectors/packet-dplay.c
epan/dissectors/packet-dsi.c
epan/dissectors/packet-dsp.c
epan/dissectors/packet-dtls.c
epan/dissectors/packet-dtp.c
epan/dissectors/packet-dtpt.c
epan/dissectors/packet-dua.c
epan/dissectors/packet-dvmrp.c
epan/dissectors/packet-e164.c
epan/dissectors/packet-e212.c
epan/dissectors/packet-eapol.c
epan/dissectors/packet-echo.c
epan/dissectors/packet-edonkey.c
epan/dissectors/packet-egd.c
epan/dissectors/packet-eigrp.c
epan/dissectors/packet-enip.c
epan/dissectors/packet-enrp.c
epan/dissectors/packet-enttec.c
epan/dissectors/packet-epl.c
epan/dissectors/packet-epl_v1.c
epan/dissectors/packet-epmd.c
epan/dissectors/packet-erf.c
epan/dissectors/packet-esis.c
epan/dissectors/packet-ess.c
epan/dissectors/packet-eth.c
epan/dissectors/packet-etheric.c
epan/dissectors/packet-etherip.c
epan/dissectors/packet-extreme.c
epan/dissectors/packet-fc.c
epan/dissectors/packet-fcct.c
epan/dissectors/packet-fcdns.c
epan/dissectors/packet-fcels.c
epan/dissectors/packet-fcfcs.c
epan/dissectors/packet-fcfzs.c
epan/dissectors/packet-fcip.c
epan/dissectors/packet-fcoe.c
epan/dissectors/packet-fcp.c
epan/dissectors/packet-fcsb3.c
epan/dissectors/packet-fcsp.c
epan/dissectors/packet-fcswils.c
epan/dissectors/packet-fddi.c
epan/dissectors/packet-ff.c
epan/dissectors/packet-fip.c
epan/dissectors/packet-fix.c
epan/dissectors/packet-fmp.c
epan/dissectors/packet-fmp_notify.c
epan/dissectors/packet-fr.c
epan/dissectors/packet-fractalgeneratorprotocol.c
epan/dissectors/packet-frame.c
epan/dissectors/packet-ftam.c
epan/dissectors/packet-ftp.c
epan/dissectors/packet-fw1.c
epan/dissectors/packet-g723.c
epan/dissectors/packet-giop.c
epan/dissectors/packet-gmrp.c
epan/dissectors/packet-gnm.c
epan/dissectors/packet-gnutella.c
epan/dissectors/packet-goose.c
epan/dissectors/packet-gpef.c
epan/dissectors/packet-gprs-llc.c
epan/dissectors/packet-gprs-ns.c
epan/dissectors/packet-gre.c
epan/dissectors/packet-gsm_a_common.c
epan/dissectors/packet-gsm_a_dtap.c
epan/dissectors/packet-gsm_a_rp.c
epan/dissectors/packet-gsm_a_rr.c
epan/dissectors/packet-gsm_bsslap.c
epan/dissectors/packet-gsm_bssmap_le.c
epan/dissectors/packet-gsm_map.c
epan/dissectors/packet-gsm_sms.c
epan/dissectors/packet-gsm_sms_ud.c
epan/dissectors/packet-gssapi.c
epan/dissectors/packet-gtp.c
epan/dissectors/packet-gtpv2.c
epan/dissectors/packet-gvrp.c
epan/dissectors/packet-h1.c
epan/dissectors/packet-h223.c
epan/dissectors/packet-h225.c
epan/dissectors/packet-h235.c
epan/dissectors/packet-h245.c
epan/dissectors/packet-h248.c
epan/dissectors/packet-h248_10.c
epan/dissectors/packet-h248_3gpp.c
epan/dissectors/packet-h248_7.c
epan/dissectors/packet-h248_annex_c.c
epan/dissectors/packet-h248_annex_e.c
epan/dissectors/packet-h248_q1950.c
epan/dissectors/packet-h261.c
epan/dissectors/packet-h263.c
epan/dissectors/packet-h263p.c
epan/dissectors/packet-h264.c
epan/dissectors/packet-h282.c
epan/dissectors/packet-h283.c
epan/dissectors/packet-h323.c
epan/dissectors/packet-h450-ros.c
epan/dissectors/packet-h450.c
epan/dissectors/packet-h460.c
epan/dissectors/packet-h501.c
epan/dissectors/packet-hci_h1.c
epan/dissectors/packet-hci_h4.c
epan/dissectors/packet-hclnfsd.c
epan/dissectors/packet-hilscher.c
epan/dissectors/packet-homeplug.c
epan/dissectors/packet-hpext.c
epan/dissectors/packet-hpsw.c
epan/dissectors/packet-hsrp.c
epan/dissectors/packet-http.c
epan/dissectors/packet-hyperscsi.c
epan/dissectors/packet-i2c.c
epan/dissectors/packet-iapp.c
epan/dissectors/packet-iax2.c
epan/dissectors/packet-icmpv6.c
epan/dissectors/packet-icp.c
epan/dissectors/packet-icq.c
epan/dissectors/packet-idp.c
epan/dissectors/packet-iec104.c
epan/dissectors/packet-ieee80211.c
epan/dissectors/packet-ieee802154.c
epan/dissectors/packet-ieee8021ah.c
epan/dissectors/packet-ieee802a.c
epan/dissectors/packet-ifcp.c
epan/dissectors/packet-igap.c
epan/dissectors/packet-igmp.c
epan/dissectors/packet-image-gif.c
epan/dissectors/packet-image-jfif.c
epan/dissectors/packet-image-png.c
epan/dissectors/packet-imf.c
epan/dissectors/packet-inap.c
epan/dissectors/packet-ip.c
epan/dissectors/packet-ipdc.c
epan/dissectors/packet-ipfc.c
epan/dissectors/packet-ipmi-app.c
epan/dissectors/packet-ipmi-chassis.c
epan/dissectors/packet-ipmi-picmg.c
epan/dissectors/packet-ipmi-se.c
epan/dissectors/packet-ipmi-session.c
epan/dissectors/packet-ipmi-storage.c
epan/dissectors/packet-ipmi-transport.c
epan/dissectors/packet-ipmi.c
epan/dissectors/packet-ipp.c
epan/dissectors/packet-ipsec-tcp.c
epan/dissectors/packet-ipsec.c
epan/dissectors/packet-ipsi-ctl.c
epan/dissectors/packet-ipv6.c
epan/dissectors/packet-ipvs-syncd.c
epan/dissectors/packet-ipx.c
epan/dissectors/packet-ipxwan.c
epan/dissectors/packet-isakmp.c
epan/dissectors/packet-iscsi.c
epan/dissectors/packet-isdn.c
epan/dissectors/packet-isis-hello.c
epan/dissectors/packet-isis-lsp.c
epan/dissectors/packet-isis-snp.c
epan/dissectors/packet-isis.c
epan/dissectors/packet-isl.c
epan/dissectors/packet-ismacryp.c
epan/dissectors/packet-ismp.c
epan/dissectors/packet-isns.c
epan/dissectors/packet-isup.c
epan/dissectors/packet-isup_thin.c
epan/dissectors/packet-iua.c
epan/dissectors/packet-iuup.c
epan/dissectors/packet-iwarp-ddp-rdmap.c
epan/dissectors/packet-iwarp-mpa.c
epan/dissectors/packet-jpeg.c
epan/dissectors/packet-k12.c
epan/dissectors/packet-kadm5.c
epan/dissectors/packet-kdp.c
epan/dissectors/packet-kerberos.c
epan/dissectors/packet-kerberos4.c
epan/dissectors/packet-kingfisher.c
epan/dissectors/packet-kink.c
epan/dissectors/packet-klm.c
epan/dissectors/packet-kpasswd.c
epan/dissectors/packet-l2tp.c
epan/dissectors/packet-lanforge.c
epan/dissectors/packet-lapb.c
epan/dissectors/packet-lapdm.c
epan/dissectors/packet-laplink.c
epan/dissectors/packet-ldap.c
epan/dissectors/packet-ldp.c
epan/dissectors/packet-ldss.c
epan/dissectors/packet-lge_monitor.c
epan/dissectors/packet-linx.c
epan/dissectors/packet-llc.c
epan/dissectors/packet-lldp.c
epan/dissectors/packet-lmi.c
epan/dissectors/packet-logotypecertextn.c
epan/dissectors/packet-loop.c
epan/dissectors/packet-lsc.c
epan/dissectors/packet-lte-rrc.c
epan/dissectors/packet-lwapp.c
epan/dissectors/packet-lwres.c
epan/dissectors/packet-m2pa.c
epan/dissectors/packet-m2tp.c
epan/dissectors/packet-m2ua.c
epan/dissectors/packet-m3ua.c
epan/dissectors/packet-mac-lte.c
epan/dissectors/packet-mbtcp.c
epan/dissectors/packet-mdshdr.c
epan/dissectors/packet-megaco.c
epan/dissectors/packet-memcache.c
epan/dissectors/packet-mesh.c
epan/dissectors/packet-mgcp.c
epan/dissectors/packet-mikey.c
epan/dissectors/packet-mip.c
epan/dissectors/packet-mip6.c
epan/dissectors/packet-mms.c
epan/dissectors/packet-mmse.c
epan/dissectors/packet-mount.c
epan/dissectors/packet-mp2t.c
epan/dissectors/packet-mp4ves.c
epan/dissectors/packet-mpeg-audio.c
epan/dissectors/packet-mpeg-pes.c
epan/dissectors/packet-mpeg1.c
epan/dissectors/packet-mpls-echo.c
epan/dissectors/packet-mq.c
epan/dissectors/packet-mrdisc.c
epan/dissectors/packet-msdp.c
epan/dissectors/packet-msnip.c
epan/dissectors/packet-msnlb.c
epan/dissectors/packet-msproxy.c
epan/dissectors/packet-msrp.c
epan/dissectors/packet-mstp.c
epan/dissectors/packet-mtp3mg.c
epan/dissectors/packet-multipart.c
epan/dissectors/packet-mysql.c
epan/dissectors/packet-nas_eps.c
epan/dissectors/packet-nbap.c
epan/dissectors/packet-nbd.c
epan/dissectors/packet-nbns.c
epan/dissectors/packet-ncp-nmas.c
epan/dissectors/packet-ncp-sss.c
epan/dissectors/packet-ncp.c
epan/dissectors/packet-ncs.c
epan/dissectors/packet-ndmp.c
epan/dissectors/packet-ndps.c
epan/dissectors/packet-netbios.c
epan/dissectors/packet-netdump.c
epan/dissectors/packet-netflow.c
epan/dissectors/packet-netsync.c
epan/dissectors/packet-nfs.c
epan/dissectors/packet-nfsacl.c
epan/dissectors/packet-nfsauth.c
epan/dissectors/packet-nhrp.c
epan/dissectors/packet-nisplus.c
epan/dissectors/packet-nlm.c
epan/dissectors/packet-nlsp.c
epan/dissectors/packet-ns_cert_exts.c
epan/dissectors/packet-nsip.c
epan/dissectors/packet-nsrp.c
epan/dissectors/packet-nt-tpcp.c
epan/dissectors/packet-ntlmssp.c
epan/dissectors/packet-ntp.c
epan/dissectors/packet-null.c
epan/dissectors/packet-ocsp.c
epan/dissectors/packet-oicq.c
epan/dissectors/packet-olsr.c
epan/dissectors/packet-omapi.c
epan/dissectors/packet-opsi.c
epan/dissectors/packet-ositp.c
epan/dissectors/packet-p7.c
epan/dissectors/packet-p_mul.c
epan/dissectors/packet-packetlogger.c
epan/dissectors/packet-pcap.c
epan/dissectors/packet-pcnfsd.c
epan/dissectors/packet-pdcp-lte.c
epan/dissectors/packet-per.c
epan/dissectors/packet-pflog.c
epan/dissectors/packet-pgm.c
epan/dissectors/packet-pgsql.c
epan/dissectors/packet-pim.c
epan/dissectors/packet-pingpongprotocol.c
epan/dissectors/packet-pkcs1.c
epan/dissectors/packet-pkcs12.c
epan/dissectors/packet-pkinit.c
epan/dissectors/packet-pkix1explicit.c
epan/dissectors/packet-pkixproxy.c
epan/dissectors/packet-pkixqualified.c
epan/dissectors/packet-pkixtsp.c
epan/dissectors/packet-pktc.c
epan/dissectors/packet-pktgen.c
epan/dissectors/packet-pop.c
epan/dissectors/packet-portmap.c
epan/dissectors/packet-ppi.c
epan/dissectors/packet-pppoe.c
epan/dissectors/packet-pres.c
epan/dissectors/packet-prp.c
epan/dissectors/packet-ptp.c
epan/dissectors/packet-pvfs2.c
epan/dissectors/packet-pw-atm.c
epan/dissectors/packet-pw-cesopsn.c
epan/dissectors/packet-pw-eth.c
epan/dissectors/packet-pw-hdlc.c
epan/dissectors/packet-pw-satop.c
epan/dissectors/packet-q2931.c
epan/dissectors/packet-q931.c
epan/dissectors/packet-q932-ros.c
epan/dissectors/packet-q932.c
epan/dissectors/packet-q933.c
epan/dissectors/packet-qllc.c
epan/dissectors/packet-qsig.c
epan/dissectors/packet-quake.c
epan/dissectors/packet-quake2.c
epan/dissectors/packet-quake3.c
epan/dissectors/packet-quakeworld.c
epan/dissectors/packet-radiotap.c
epan/dissectors/packet-radius.c
epan/dissectors/packet-radius_packetcable.c
epan/dissectors/packet-ranap.c
epan/dissectors/packet-rdm.c
epan/dissectors/packet-rdt.c
epan/dissectors/packet-redbackli.c
epan/dissectors/packet-retix-bpdu.c
epan/dissectors/packet-rfc2190.c
epan/dissectors/packet-rgmp.c
epan/dissectors/packet-rip.c
epan/dissectors/packet-ripng.c
epan/dissectors/packet-rlc-lte.c
epan/dissectors/packet-rlm.c
epan/dissectors/packet-rlogin.c
epan/dissectors/packet-rmi.c
epan/dissectors/packet-rmp.c
epan/dissectors/packet-rmt-alc.c
epan/dissectors/packet-rmt-norm.c
epan/dissectors/packet-rnsap.c
epan/dissectors/packet-roofnet.c
epan/dissectors/packet-rpc.c
epan/dissectors/packet-rpcap.c
epan/dissectors/packet-rpl.c
epan/dissectors/packet-rquota.c
epan/dissectors/packet-rrc.c
epan/dissectors/packet-rrlp.c
epan/dissectors/packet-rsl.c
epan/dissectors/packet-rstat.c
epan/dissectors/packet-rsync.c
epan/dissectors/packet-rtcp.c
epan/dissectors/packet-rtmpt.c
epan/dissectors/packet-rtnet.c
epan/dissectors/packet-rtp-events.c
epan/dissectors/packet-rtp.c
epan/dissectors/packet-rtps.c
epan/dissectors/packet-rtps2.c
epan/dissectors/packet-rtse.c
epan/dissectors/packet-rtsp.c
epan/dissectors/packet-rudp.c
epan/dissectors/packet-rwall.c
epan/dissectors/packet-rx.c
epan/dissectors/packet-s1ap.c
epan/dissectors/packet-s4406.c
epan/dissectors/packet-s5066.c
epan/dissectors/packet-sabp.c
epan/dissectors/packet-sadmind.c
epan/dissectors/packet-sap.c
epan/dissectors/packet-sbus.c
epan/dissectors/packet-sccp.c
epan/dissectors/packet-sccpmg.c
epan/dissectors/packet-scriptingservice.c
epan/dissectors/packet-scsi-mmc.c
epan/dissectors/packet-scsi-osd.c
epan/dissectors/packet-scsi-sbc.c
epan/dissectors/packet-scsi-smc.c
epan/dissectors/packet-scsi-ssc.c
epan/dissectors/packet-scsi.c
epan/dissectors/packet-sctp.c
epan/dissectors/packet-sdlc.c
epan/dissectors/packet-sdp.c
epan/dissectors/packet-sebek.c
epan/dissectors/packet-ses.c
epan/dissectors/packet-sflow.c
epan/dissectors/packet-sigcomp.c
epan/dissectors/packet-simulcrypt.c
epan/dissectors/packet-sip.c
epan/dissectors/packet-sipfrag.c
epan/dissectors/packet-skinny.c
epan/dissectors/packet-sll.c
epan/dissectors/packet-slowprotocols.c
epan/dissectors/packet-slsk.c
epan/dissectors/packet-smb-browse.c
epan/dissectors/packet-smb-logon.c
epan/dissectors/packet-smb.c
epan/dissectors/packet-smb2.c
epan/dissectors/packet-smpp.c
epan/dissectors/packet-smrse.c
epan/dissectors/packet-smtp.c
epan/dissectors/packet-sna.c
epan/dissectors/packet-sndcp.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-socks.c
epan/dissectors/packet-spnego.c
epan/dissectors/packet-spp.c
epan/dissectors/packet-spray.c
epan/dissectors/packet-sqloracle.c
epan/dissectors/packet-srp.c
epan/dissectors/packet-srvloc.c
epan/dissectors/packet-sscf-nni.c
epan/dissectors/packet-sscop.c
epan/dissectors/packet-ssl.c
epan/dissectors/packet-starteam.c
epan/dissectors/packet-stat-notify.c
epan/dissectors/packet-stat.c
epan/dissectors/packet-stun.c
epan/dissectors/packet-stun2.c
epan/dissectors/packet-sua.c
epan/dissectors/packet-symantec.c
epan/dissectors/packet-synergy.c
epan/dissectors/packet-synphasor.c
epan/dissectors/packet-t125.c
epan/dissectors/packet-t30.c
epan/dissectors/packet-t38.c
epan/dissectors/packet-tapa.c
epan/dissectors/packet-tcap.c
epan/dissectors/packet-tcp.c
epan/dissectors/packet-tds.c
epan/dissectors/packet-teamspeak2.c
epan/dissectors/packet-teredo.c
epan/dissectors/packet-tftp.c
epan/dissectors/packet-tipc.c
epan/dissectors/packet-tnef.c
epan/dissectors/packet-tns.c
epan/dissectors/packet-tr.c
epan/dissectors/packet-trmac.c
epan/dissectors/packet-tsp.c
epan/dissectors/packet-turbocell.c
epan/dissectors/packet-turnchannel.c
epan/dissectors/packet-tzsp.c
epan/dissectors/packet-ucp.c
epan/dissectors/packet-udld.c
epan/dissectors/packet-udp.c
epan/dissectors/packet-ulp.c
epan/dissectors/packet-uma.c
epan/dissectors/packet-umts_fp.c
epan/dissectors/packet-usb-masstorage.c
epan/dissectors/packet-usb.c
epan/dissectors/packet-uts.c
epan/dissectors/packet-v120.c
epan/dissectors/packet-v5ua.c
epan/dissectors/packet-vj.c
epan/dissectors/packet-vnc.c
epan/dissectors/packet-vrrp.c
epan/dissectors/packet-vtp.c
epan/dissectors/packet-wassp.c
epan/dissectors/packet-wcp.c
epan/dissectors/packet-wfleet-hdlc.c
epan/dissectors/packet-who.c
epan/dissectors/packet-windows-common.c
epan/dissectors/packet-wlancertextn.c
epan/dissectors/packet-wlccp.c
epan/dissectors/packet-wol.c
epan/dissectors/packet-wow.c
epan/dissectors/packet-wps.c
epan/dissectors/packet-wsmp.c
epan/dissectors/packet-wsp.c
epan/dissectors/packet-wtls.c
epan/dissectors/packet-wtp.c
epan/dissectors/packet-x224.c
epan/dissectors/packet-x25.c
epan/dissectors/packet-x2ap.c
epan/dissectors/packet-x411.c
epan/dissectors/packet-x420.c
epan/dissectors/packet-x509af.c
epan/dissectors/packet-x509ce.c
epan/dissectors/packet-x509if.c
epan/dissectors/packet-x509sat.c
epan/dissectors/packet-xdmcp.c
epan/dissectors/packet-xml.c
epan/dissectors/packet-xot.c
epan/dissectors/packet-xtp.c
epan/dissectors/packet-xyplex.c
epan/dissectors/packet-yhoo.c
epan/dissectors/packet-ymsg.c
epan/dissectors/packet-ypbind.c
epan/dissectors/packet-yppasswd.c
epan/dissectors/packet-ypserv.c
epan/dissectors/packet-ypxfr.c
epan/dissectors/packet-zbee-aps.c
epan/dissectors/packet-zbee-nwk.c
epan/dissectors/packet-zbee-security.c
epan/dissectors/packet-zbee-zdp.c
epan/dissectors/packet-zebra.c
epan/dissectors/packet-zep.c
epan/dissectors/packet-zrtp.c

index 2c24863331fe5c6b9ec57abaf56471136efd6a34..ee9750b0d8dda8465d11e9fddc53aea385b905b8 100644 (file)
@@ -307,7 +307,7 @@ static hf_register_info hf[] = {
                {  "FEC Payload",
                        "2dparityfec.payload",
                        FT_BYTES,
-                       BASE_HEX,
+                       BASE_NONE,
                        NULL,
                        0x0,
                        NULL,
index 2e0e08ccbc7c70b5b813185e2d8e2f2f6d808512..41c75b9a63dbd6ffaaa7b50ef16267a41ac190ac 100644 (file)
@@ -683,7 +683,7 @@ proto_register_njack(void)
 
        /* NJACK header */
                { &hf_njack_magic,
-               { "Magic",      "njack.magic", FT_STRING, BASE_DEC, NULL,
+               { "Magic",      "njack.magic", FT_STRING, BASE_NONE, NULL,
                        0x0, NULL, HFILL }},
 
                { &hf_njack_type,
@@ -725,7 +725,7 @@ proto_register_njack(void)
                         0x0, NULL, HFILL }},
 
                 { &hf_njack_tlv_typestring,
-                { "TlvTypeString",   "njack.tlv.typestring", FT_STRING, BASE_DEC, NULL,
+                { "TlvTypeString",   "njack.tlv.typestring", FT_STRING, BASE_NONE, NULL,
                         0x0, NULL, HFILL }},
 
                /* 1st tab */
index 2ea3b00540f78cd1a1e14e2d731a96207577ba5e..3952fbf5505e20567abbff9cba83de8c46e73653 100644 (file)
@@ -102,11 +102,11 @@ proto_register_3com_xns(void)
                /* registered here but handled in ethertype.c */
                { &hf_3com_xns_type_ethertype,
                { "Type", "3comxns.type", FT_UINT16, BASE_HEX,
-                       VALS(etype_vals), 0x0, "", HFILL }},
+                       VALS(etype_vals), 0x0, NULL, HFILL }},
 
                { &hf_3com_xns_type_retix_bpdu,
                { "Type", "3comxns.type", FT_UINT16, BASE_HEX,
-                       VALS(retix_bpdu_type_vals), 0x0, "", HFILL }},
+                       VALS(retix_bpdu_type_vals), 0x0, NULL, HFILL }},
        };
 
        static gint *ett[] ={
index fb55d84965da13dc900dfc74adea9eb7659a7d85..80354a1fee3458a6b91e71b33199e44c2de2ec07 100644 (file)
@@ -1743,7 +1743,7 @@ proto_register_a11(void)
          { &hf_a11_flags,
                {"Flags", "a11.flags",
                 FT_UINT8, BASE_HEX, NULL, 0x0,
-                "", HFILL}
+                NULL, HFILL}
          },
          { &hf_a11_s,
                 {"Simultaneous Bindings",           "a11.s",
@@ -1774,7 +1774,7 @@ proto_register_a11(void)
          { &hf_a11_v,
                 { "Van Jacobson",           "a11.v",
                   FT_BOOLEAN, 8, NULL, 4,
-                  "Van Jacobson", HFILL }
+                  NULL, HFILL }
          },
          { &hf_a11_t,
                 { "Reverse Tunneling",           "a11.t",
@@ -1834,8 +1834,8 @@ proto_register_a11(void)
          },
          { &hf_a11_ext,
                 { "Extension",                      "a11.extension",
-                       FT_BYTES, BASE_HEX, NULL, 0,
-                       "Extension", HFILL }
+                       FT_BYTES, BASE_NONE, NULL, 0,
+                       NULL, HFILL }
          },
          { &hf_a11_aext_spi,
                 { "SPI",                      "a11.auth.spi",
@@ -1850,7 +1850,7 @@ proto_register_a11(void)
          { &hf_a11_next_nai,
                 { "NAI",                      "a11.nai",
                        FT_STRING, BASE_NONE, NULL, 0,
-                       "NAI", HFILL }
+                       NULL, HFILL }
          },
          { &hf_a11_ses_key,
                 { "Key",                      "a11.ext.key",
@@ -1860,12 +1860,12 @@ proto_register_a11(void)
          { &hf_a11_ses_sidver,
                { "Session ID Version",         "a11.ext.sidver",
                        FT_UINT8, BASE_DEC, NULL, 3,
-                       "Session ID Version", HFILL}
+                       NULL, HFILL}
          },
          { &hf_a11_ses_mnsrid,
                 { "MNSR-ID",                      "a11.ext.mnsrid",
                        FT_UINT16, BASE_HEX, NULL, 0,
-                       "MNSR-ID", HFILL }
+                       NULL, HFILL }
          },
          { &hf_a11_ses_msid_type,
                 { "MSID Type",                      "a11.ext.msid_type",
@@ -1924,13 +1924,13 @@ proto_register_a11(void)
          },
          { &hf_a11_vse_panid,
                 { "PANID",                      "a11.ext.panid",
-                       FT_BYTES, BASE_HEX, NULL, 0,
-                       "PANID", HFILL }
+                       FT_BYTES, BASE_NONE, NULL, 0,
+                       NULL, HFILL }
          },
          { &hf_a11_vse_canid,
                 { "CANID",                      "a11.ext.canid",
-                       FT_BYTES, BASE_HEX, NULL, 0,
-                       "CANID", HFILL }
+                       FT_BYTES, BASE_NONE, NULL, 0,
+                       NULL, HFILL }
          },
          { &hf_a11_vse_qosmode,
                 { "QoS Mode",       "a11.ext.qosmode",
index aeebfc5efe01730227d0b6d23ac497d08e572ce8..e01e9e5acea585af3f02cd775fd96b1db45f9f66 100644 (file)
@@ -690,7 +690,7 @@ void proto_register_9P(void)
                  "9P Tag", HFILL}},
                {&hf_9P_oldtag,
                 {"Old tag", "9p.oldtag", FT_UINT16, BASE_DEC, NULL, 0x0,
-                 "Old tag", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_parmsz,
                 {"Param length", "9p.paramsz", FT_UINT16, BASE_DEC, NULL, 0x0,
                  "Parameter length", HFILL}},
@@ -705,43 +705,43 @@ void proto_register_9P(void)
                  "Number of Qid results", HFILL}},
                {&hf_9P_mode,
                 {"Mode", "9p.mode", FT_UINT8, BASE_HEX, NULL, 0x0,
-                 "Mode", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_mode_rwx,
                 {"Open/Create Mode", "9p.mode.rwx", FT_UINT8, BASE_DEC,VALS(ninep_mode_vals),P9_MODEMASK,
-                 "Open/Create Mode", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_mode_t,
                 {"Trunc", "9p.mode.trunc", FT_BOOLEAN, 8, TFS(&flags_set_truth), P9_OTRUNC,
                  "Truncate", HFILL}},
                {&hf_9P_mode_c,
                 {"Remove on close", "9p.mode.orclose", FT_BOOLEAN, 8, TFS(&flags_set_truth), P9_ORCLOSE,
-                 "", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_iounit,
                 {"I/O Unit", "9p.iounit", FT_UINT32, BASE_DEC, NULL, 0x0,
-                 "I/O Unit", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_count,
                 {"Count", "9p.count", FT_UINT32, BASE_DEC, NULL, 0x0,
-                 "Count", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_offset,
                 {"Offset", "9p.offset", FT_UINT64, BASE_DEC, NULL, 0x0,
-                 "Offset", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_perm,
                 {"Permissions", "9p.perm", FT_UINT32, BASE_OCT, NULL, 0x0,
                  "Permission bits", HFILL}},
                {&hf_9P_qidpath,
                 {"Qid path", "9p.qidpath", FT_UINT64, BASE_DEC, NULL, 0x0,
-                 "Qid path", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_qidvers,
                 {"Qid version", "9p.qidvers", FT_UINT32, BASE_DEC, NULL, 0x0,
-                 "Qid version", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_qidtype,
                 {"Qid type", "9p.qidtype", FT_UINT8, BASE_HEX, NULL, 0x0,
-                 "Qid type", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_statmode,
                 {"Mode", "9p.statmode", FT_UINT32, BASE_OCT, NULL, 0x0,
                  "File mode flags", HFILL}},
                {&hf_9P_stattype,
                 {"Type", "9p.stattype", FT_UINT16, BASE_DEC, NULL, 0x0,
-                 "Type", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_atime,
                 {"Atime", "9p.atime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
                  "Access Time", HFILL}},
@@ -753,13 +753,13 @@ void proto_register_9P(void)
                  "File Length", HFILL}},
                {&hf_9P_dev,
                 {"Dev", "9p.dev", FT_UINT32, BASE_DEC, NULL, 0x0,
-                 "", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_wname,
                 {"Wname", "9p.wname", FT_STRING, BASE_NONE, NULL, 0x0,
                  "Path Name Element", HFILL}},
                {&hf_9P_version,
                 {"Version", "9p.version", FT_STRING, BASE_NONE, NULL, 0x0,
-                 "Version", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_afid,
                 {"Afid", "9p.fid", FT_UINT32, BASE_DEC, NULL, 0x0,
                  "Authenticating FID", HFILL}},
@@ -777,10 +777,10 @@ void proto_register_9P(void)
                  "Name of file", HFILL}},
                {&hf_9P_sdlen,
                 {"Stat data length", "9p.sdlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-                 "Stat data length", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_filename,
                 {"File name", "9p.filename", FT_STRING, BASE_NONE, NULL, 0x0,
-                 "File name", HFILL}},
+                 NULL, HFILL}},
                {&hf_9P_uid,
                 {"Uid", "9p.uid", FT_STRING, BASE_NONE, NULL, 0x0,
                  "User id", HFILL}},
index 5162de44489655ffee79109507ec2318052204d3..0ea0451e32f71fa4792e1d4584f226d790c34181 100644 (file)
@@ -275,67 +275,67 @@ proto_register_aarp(void)
     { &hf_aarp_hard_type,
       { "Hardware type",               "aarp.hard.type",
        FT_UINT16,      BASE_HEX,       VALS(hrd_vals), 0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_proto_type,
       { "Protocol type",               "aarp.proto.type",
        FT_UINT16,      BASE_HEX,       VALS(etype_vals),       0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_hard_size,
       { "Hardware size",               "aarp.hard.size",
        FT_UINT8,       BASE_DEC,       NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_proto_size,
       { "Protocol size",               "aarp.proto.size",
        FT_UINT8,       BASE_DEC,       NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_opcode,
       { "Opcode",                      "aarp.opcode",
        FT_UINT16,      BASE_DEC,       VALS(op_vals),  0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_src_hw,
       { "Sender hardware address",     "aarp.src.hw",
        FT_BYTES,       BASE_NONE,      NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_src_hw_mac,
       { "Sender MAC address",          "aarp.src.hw_mac",
        FT_ETHER,       BASE_NONE,      NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_src_proto,
       { "Sender protocol address",     "aarp.src.proto",
        FT_BYTES,       BASE_NONE,      NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_src_proto_id,
       { "Sender ID",                   "aarp.src.proto_id",
-       FT_BYTES,       BASE_HEX,       NULL,   0x0,
-       "", HFILL }},
+       FT_BYTES,       BASE_NONE,      NULL,   0x0,
+       NULL, HFILL }},
 
     { &hf_aarp_dst_hw,
       { "Target hardware address",     "aarp.dst.hw",
        FT_BYTES,       BASE_NONE,      NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_dst_hw_mac,
       { "Target MAC address",          "aarp.dst.hw_mac",
        FT_ETHER,       BASE_NONE,      NULL,   0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_aarp_dst_proto,
       { "Target protocol address",     "aarp.dst.proto",
        FT_BYTES,       BASE_NONE,      NULL,   0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_aarp_dst_proto_id,
       { "Target ID",                   "aarp.dst.proto_id",
-       FT_BYTES,       BASE_HEX,       NULL,   0x0,
-       "", HFILL }},
+       FT_BYTES,       BASE_NONE,      NULL,   0x0,
+       NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_aarp,
index e71a648b0216a1890205018c20c640484aea3031..d6703f8301db8570a17803a89bfd70b28ef4abe1 100644 (file)
@@ -2663,7 +2663,7 @@ void proto_register_acn(void)
     /* DMP data */
     { &hf_acn_data,
       { "Data", "acn.dmp_data",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_acn_data8,
@@ -2689,7 +2689,7 @@ void proto_register_acn(void)
 
     { &hf_acn_dmp_address_data_pairs,
       { "Address-Data Pairs", "acn.dmp_address_data_pairs",
-        FT_BYTES, BASE_DEC, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "More address-data pairs", HFILL }
     },
 
index a12c28e8e3ae272057b7e99693c2883f347e09b8..af3e2ff49267a09efffe2e599062a401ce109725 100644 (file)
@@ -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"
index ff30c540e2da26df1e4bb25db5d58dd25d5646f2..6deca1ce5e6e9960478bcaf62b6e21c1e775107d 100644 (file)
@@ -1776,11 +1776,11 @@ void proto_register_acse(void) {
         "acse.T_single_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned,
       { "octet-aligned", "acse.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_octet_aligned", HFILL }},
     { &hf_acse_arbitrary,
       { "arbitrary", "acse.arbitrary",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.BIT_STRING", HFILL }},
     { &hf_acse_aarq,
       { "aarq", "acse.aarq",
@@ -1816,7 +1816,7 @@ void proto_register_acse(void) {
         "acse.ACRP_apdu", HFILL }},
     { &hf_acse_aARQ_protocol_version,
       { "protocol-version", "acse.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_AARQ_protocol_version", HFILL }},
     { &hf_acse_aARQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
@@ -1856,7 +1856,7 @@ void proto_register_acse(void) {
         "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_sender_acse_requirements,
       { "sender-acse-requirements", "acse.sender_acse_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ACSE_requirements", HFILL }},
     { &hf_acse_mechanism_name,
       { "mechanism-name", "acse.mechanism_name",
@@ -1892,7 +1892,7 @@ void proto_register_acse(void) {
         "acse.Association_data", HFILL }},
     { &hf_acse_aARE_protocol_version,
       { "protocol-version", "acse.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_AARE_protocol_version", HFILL }},
     { &hf_acse_aARE_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
@@ -1924,7 +1924,7 @@ void proto_register_acse(void) {
         "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_responder_acse_requirements,
       { "responder-acse-requirements", "acse.responder_acse_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ACSE_requirements", HFILL }},
     { &hf_acse_responding_authentication_value,
       { "responding-authentication-value", "acse.responding_authentication_value",
@@ -2016,7 +2016,7 @@ void proto_register_acse(void) {
         "acse.ASO_qualifier_form3", HFILL }},
     { &hf_acse_aso_qualifier_form_any_octets,
       { "aso-qualifier-form-any-octets", "acse.aso_qualifier_form_any_octets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ASO_qualifier_form_octets", HFILL }},
     { &hf_acse_ae_title_form1,
       { "ae-title-form1", "acse.ae_title_form1",
@@ -2112,7 +2112,7 @@ void proto_register_acse(void) {
         "acse.EXTERNALt", HFILL }},
     { &hf_acse_simply_encoded_data,
       { "simply-encoded-data", "acse.simply_encoded_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.Simply_encoded_data", HFILL }},
     { &hf_acse_fully_encoded_data,
       { "fully-encoded-data", "acse.fully_encoded_data",
@@ -2132,7 +2132,7 @@ void proto_register_acse(void) {
         "acse.T_simple_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned_01,
       { "octet-aligned", "acse.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.OCTET_STRING", HFILL }},
     { &hf_acse_other_mechanism_name,
       { "other-mechanism-name", "acse.other_mechanism_name",
@@ -2148,7 +2148,7 @@ void proto_register_acse(void) {
         "acse.GraphicString", HFILL }},
     { &hf_acse_bitstring,
       { "bitstring", "acse.bitstring",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.BIT_STRING", HFILL }},
     { &hf_acse_external,
       { "external", "acse.external",
@@ -2161,27 +2161,27 @@ void proto_register_acse(void) {
     { &hf_acse_T_AARQ_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_T_AARE_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_authentication,
       { "authentication", "acse.authentication",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_aSO_context_negotiation,
       { "aSO-context-negotiation", "acse.aSO-context-negotiation",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_higher_level_association,
       { "higher-level-association", "acse.higher-level-association",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_nested_association,
       { "nested-association", "acse.nested-association",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-acse-hfarr.c ---*/
 #line 252 "packet-acse-template.c"
index bf6d12a89eeaac93066a316927aee1f204734b50..0eb9ae6c7ab15e5e550218b29554bf6019aa3950 100644 (file)
@@ -727,48 +727,48 @@ void proto_register_actrace(void)
               "Capture Time", HFILL }},
                { &hf_actrace_cas_source,
                        { "Source", "actrace.cas.source", FT_INT32, BASE_DEC, VALS(actrace_cas_source_vals), 0x0,
-              "Source", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_current_state,
                        { "Current State", "actrace.cas.curr_state", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Current State", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_event,
                        { "Event", "actrace.cas.event", FT_INT32, BASE_DEC, VALS(actrace_cas_event_vals), 0x0,
               "New Event", HFILL }},
                { &hf_actrace_cas_next_state,
                        { "Next State", "actrace.cas.next_state", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Next State", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_function,
                        { "Function", "actrace.cas.function", FT_INT32, BASE_DEC, VALS(actrace_cas_function_vals), 0x0,
-              "Function", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_par0,
                        { "Parameter 0", "actrace.cas.par0", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Parameter 0", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_par1,
                        { "Parameter 1", "actrace.cas.par1", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Parameter 1", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_par2,
                        { "Parameter 2", "actrace.cas.par2", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Parameter 2", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_trunk,
                        { "Trunk Number", "actrace.cas.trunk", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Trunk Number", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_bchannel,
                        { "BChannel", "actrace.cas.bchannel", FT_INT32, BASE_DEC, NULL, 0x0,
-              "BChannel", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_cas_connection_id,
                        { "Connection ID", "actrace.cas.conn_id", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Connection ID", HFILL }},
+              NULL, HFILL }},
 
                /* ISDN */
                { &hf_actrace_isdn_trunk,
                        { "Trunk Number", "actrace.isdn.trunk", FT_INT16, BASE_DEC, NULL, 0x0,
-              "Trunk Number", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_isdn_direction,
                        { "Direction", "actrace.isdn.dir", FT_INT32, BASE_DEC, VALS(actrace_isdn_direction_vals), 0x0,
-              "Direction", HFILL }},
+              NULL, HFILL }},
                { &hf_actrace_isdn_length,
                        { "Length", "actrace.isdn.length", FT_INT16, BASE_DEC, NULL, 0x0,
-              "Length", HFILL }},  
+              NULL, HFILL }},  
     };
 
     static gint *ett[] =
index ea71a489f423bc3ffb51b8b36a8e73e42521d91b..f0c5406067bf9a8318111b67d66b4ebe33377537 100644 (file)
@@ -4469,7 +4469,7 @@ proto_register_afp(void)
     { &hf_afp_user,
       { "User",         "afp.user",
                FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-       "User", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_user_type,
       { "Type",         "afp.user_type",
@@ -4487,11 +4487,11 @@ proto_register_afp(void)
     { &hf_afp_passwd,
       { "Password",     "afp.passwd",
                FT_STRINGZ, BASE_NONE, NULL, 0x0,
-       "Password", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_random,
       { "Random number",         "afp.random",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
+               FT_BYTES, BASE_NONE, NULL, 0x0,
        "UAM random number", HFILL }},
 
     { &hf_afp_response_to,
@@ -4567,12 +4567,12 @@ proto_register_afp(void)
     { &hf_afp_vol_attribute_NoNetworkUserID,
       { "No Network User ID",         "afp.vol_attribute.network_user_id",
                 FT_BOOLEAN, 16, NULL, kNoNetworkUserIDs,
-       "No Network User ID", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_vol_attribute_DefaultPrivsFromParent,
       { "Inherit parent privileges",         "afp.vol_attribute.inherit_parent_privs",
                 FT_BOOLEAN, 16, NULL, kDefaultPrivsFromParent,
-       "Inherit parent privileges", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_vol_attribute_NoExchangeFiles,
       { "No exchange files",         "afp.vol_attribute.no_exchange_files",
@@ -4752,12 +4752,12 @@ proto_register_afp(void)
     { &hf_afp_dir_attribute_RenameInhibit,
       { "Rename inhibit",         "afp.dir_attribute.rename_inhibit",
            FT_BOOLEAN, 16, NULL,  kFPRenameInhibitBit,
-       "Rename inhibit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_attribute_DeleteInhibit,
       { "Delete inhibit",         "afp.dir_attribute.delete_inhibit",
            FT_BOOLEAN, 16, NULL,  kFPDeleteInhibitBit,
-       "Delete inhibit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_attribute_SetClear,
       { "Set",         "afp.dir_attribute.set_clear",
@@ -4873,7 +4873,7 @@ proto_register_afp(void)
     { &hf_afp_file_attribute_WriteInhibit,
       { "Write inhibit",         "afp.file_attribute.write_inhibit",
            FT_BOOLEAN, 16, NULL,  kFPWriteInhibitBit,
-       "Write inhibit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_file_attribute_BackUpNeeded,
       { "Backup needed",         "afp.file_attribute.backup_needed",
@@ -4919,7 +4919,7 @@ proto_register_afp(void)
     { &hf_afp_vol_id,
       { "Volume id",         "afp.vol_id",
                FT_UINT16, BASE_DEC, NULL, 0x0,
-       "Volume id", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_vol_signature,
       { "Signature",         "afp.vol_signature",
@@ -4979,7 +4979,7 @@ proto_register_afp(void)
     { &hf_afp_dir_bitmap,
       { "Directory bitmap",         "afp.dir_bitmap",
                FT_UINT16, BASE_HEX, NULL, 0x0,
-       "Directory bitmap", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_offspring,
       { "Offspring",         "afp.dir_offspring",
@@ -4999,22 +4999,22 @@ proto_register_afp(void)
     { &hf_afp_creation_date,
       { "Creation date",         "afp.creation_date",
                FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-       "Creation date", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_modification_date,
       { "Modification date",         "afp.modification_date",
                FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-       "Modification date", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_backup_date,
       { "Backup date",         "afp.backup_date",
                FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-       "Backup date", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_finder_info,
       { "Finder info",         "afp.finder_info",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
-       "Finder info", HFILL }},
+               FT_BYTES, BASE_NONE, NULL, 0x0,
+       NULL, HFILL }},
 
     { &hf_afp_long_name_offset,
       { "Long name offset",    "afp.long_name_offset",
@@ -5044,12 +5044,12 @@ proto_register_afp(void)
     { &hf_afp_unix_privs_permissions,
       { "Permissions",     "afp.unix_privs.permissions",
                FT_UINT32, BASE_OCT, NULL, 0x0,
-       "Permissions", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_unix_privs_ua_permissions,
       { "User's access rights",     "afp.unix_privs.ua_permissions",
                FT_UINT32, BASE_HEX, NULL, 0x0,
-       "User's access rights", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_file_id,
       { "File ID",         "afp.file_id",
@@ -5059,12 +5059,12 @@ proto_register_afp(void)
     { &hf_afp_file_DataForkLen,
       { "Data fork size",         "afp.data_fork_len",
                FT_UINT32, BASE_DEC, NULL, 0x0,
-       "Data fork size", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_file_RsrcForkLen,
       { "Resource fork size",         "afp.resource_fork_len",
                FT_UINT32, BASE_DEC, NULL, 0x0,
-       "Resource fork size", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_file_ExtDataForkLen,
       { "Extended data fork size",         "afp.ext_data_fork_len",
@@ -5079,7 +5079,7 @@ proto_register_afp(void)
     { &hf_afp_file_bitmap,
       { "File bitmap",         "afp.file_bitmap",
                FT_UINT16, BASE_HEX, NULL, 0x0,
-       "File bitmap", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_req_count,
       { "Req count",         "afp.req_count",
@@ -5094,7 +5094,7 @@ proto_register_afp(void)
     { &hf_afp_max_reply_size,
       { "Reply size",         "afp.reply_size",
                FT_UINT16, BASE_DEC, NULL, 0x0,
-       "Reply size", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_start_index32,
       { "Start index",         "afp.start_index32",
@@ -5104,7 +5104,7 @@ proto_register_afp(void)
     { &hf_afp_max_reply_size32,
       { "Reply size",         "afp.reply_size32",
                FT_UINT32, BASE_DEC, NULL, 0x0,
-       "Reply size", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_file_flag,
       { "Dir",         "afp.file_flag",
@@ -5184,12 +5184,12 @@ proto_register_afp(void)
     { &hf_afp_request_bitmap_PartialNames,
        { "Match on partial names",         "afp.request_bitmap.partial_names",
            FT_BOOLEAN, 32, NULL,  0x80000000,
-       "Match on partial names", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_request_bitmap,
       { "Request bitmap",         "afp.request_bitmap",
                FT_UINT32, BASE_HEX, NULL, 0x0,
-       "Request bitmap", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_struct_size,
       { "Struct size",         "afp.struct_size",
@@ -5219,7 +5219,7 @@ proto_register_afp(void)
     { &hf_afp_offset,
       { "Offset",         "afp.offset",
                FT_INT32, BASE_DEC, NULL, 0x0,
-       "Offset", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_rw_count,
       { "Count",         "afp.rw_count",
@@ -5249,7 +5249,7 @@ proto_register_afp(void)
     { &hf_afp_ofork_len,
       { "New length",         "afp.ofork_len",
                FT_INT32, BASE_DEC, NULL, 0x0,
-       "New length", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_path_type,
       { "Type",         "afp.path_type",
@@ -5269,7 +5269,7 @@ proto_register_afp(void)
     { &hf_afp_path_unicode_hint,
       { "Unicode hint",  "afp.path_unicode_hint",
                FT_UINT32, BASE_HEX, VALS(unicode_hint_vals), 0x0,
-       "Unicode hint", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_path_name,
       { "Name",  "afp.path_name",
@@ -5299,12 +5299,12 @@ proto_register_afp(void)
     { &hf_afp_access_deny_read,
       { "Deny read",         "afp.access.deny_read",
        FT_BOOLEAN, 8, NULL,  0x10,
-       "Deny read", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_access_deny_write,
       { "Deny write",         "afp.access.deny_write",
        FT_BOOLEAN, 8, NULL,  0x20,
-       "Deny write", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_comment,
       { "Comment",         "afp.comment",
@@ -5314,17 +5314,17 @@ proto_register_afp(void)
     { &hf_afp_file_creator,
       { "File creator",         "afp.file_creator",
                FT_STRING, BASE_NONE, NULL, 0x0,
-       "File creator", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_file_type,
       { "File type",         "afp.file_type",
                FT_STRING, BASE_NONE, NULL, 0x0,
-       "File type", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_icon_type,
       { "Icon type",         "afp.icon_type",
                FT_UINT8, BASE_HEX, NULL , 0,
-       "Icon type", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_icon_length,
       { "Size",         "afp.icon_length",
@@ -5384,67 +5384,67 @@ proto_register_afp(void)
     { &hf_afp_dir_ar_o_search,
       { "Owner has search access",      "afp.dir_ar.o_search",
                FT_BOOLEAN, 32, NULL, AR_O_SEARCH,
-       "Owner has search access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_o_read,
       { "Owner has read access",        "afp.dir_ar.o_read",
                FT_BOOLEAN, 32, NULL, AR_O_READ,
-       "Owner has read access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_o_write,
       { "Owner has write access",       "afp.dir_ar.o_write",
                FT_BOOLEAN, 32, NULL, AR_O_WRITE,
-       "Owner has write access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_g_search,
       { "Group has search access",      "afp.dir_ar.g_search",
                FT_BOOLEAN, 32, NULL, AR_G_SEARCH,
-       "Group has search access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_g_read,
       { "Group has read access",        "afp.dir_ar.g_read",
                FT_BOOLEAN, 32, NULL, AR_G_READ,
-       "Group has read access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_g_write,
       { "Group has write access",       "afp.dir_ar.g_write",
                FT_BOOLEAN, 32, NULL, AR_G_WRITE,
-       "Group has write access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_e_search,
       { "Everyone has search access",   "afp.dir_ar.e_search",
                FT_BOOLEAN, 32, NULL, AR_E_SEARCH,
-       "Everyone has search access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_e_read,
       { "Everyone has read access",     "afp.dir_ar.e_read",
                FT_BOOLEAN, 32, NULL, AR_E_READ,
-       "Everyone has read access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_e_write,
       { "Everyone has write access",    "afp.dir_ar.e_write",
                FT_BOOLEAN, 32, NULL, AR_E_WRITE,
-       "Everyone has write access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_search,
       { "User has search access",   "afp.dir_ar.u_search",
                FT_BOOLEAN, 32, NULL, AR_U_SEARCH,
-       "User has search access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_read,
       { "User has read access",     "afp.dir_ar.u_read",
                FT_BOOLEAN, 32, NULL, AR_U_READ,
-       "User has read access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_write,
       { "User has write access",     "afp.dir_ar.u_write",
                FT_BOOLEAN, 32, NULL, AR_U_WRITE,
-       "User has write access", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_blank,
       { "Blank access right",     "afp.dir_ar.blank",
                FT_BOOLEAN, 32, NULL, AR_BLANK,
-       "Blank access right", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_own,
       { "User is the owner",     "afp.dir_ar.u_owner",
@@ -5454,7 +5454,7 @@ proto_register_afp(void)
     { &hf_afp_server_time,
       { "Server time",         "afp.server_time",
                FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-       "Server time", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_cat_req_matches,
       { "Max answers",         "afp.cat_req_matches",
@@ -5463,8 +5463,8 @@ proto_register_afp(void)
 
     { &hf_afp_reserved,
       { "Reserved",         "afp.reserved",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
-       "Reserved", HFILL }},
+               FT_BYTES, BASE_NONE, NULL, 0x0,
+       NULL, HFILL }},
 
     { &hf_afp_cat_count,
       { "Cat count",         "afp.cat_count",
@@ -5473,7 +5473,7 @@ proto_register_afp(void)
 
     { &hf_afp_cat_position,
       { "Position",         "afp.cat_position",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
+               FT_BYTES, BASE_NONE, NULL, 0x0,
        "Reserved", HFILL }},
 
     { &hf_afp_map_name_type,
@@ -5555,7 +5555,7 @@ proto_register_afp(void)
 
     { &hf_afp_session_token,
       { "Token",         "afp.session_token",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
+               FT_BYTES, BASE_NONE, NULL, 0x0,
        "Session token", HFILL }},
 
     { &hf_afp_user_flag,
@@ -5566,21 +5566,21 @@ proto_register_afp(void)
     { &hf_afp_user_ID,
       { "User ID",         "afp.user_ID",
                FT_UINT32, BASE_DEC, NULL, 0x0,
-       "User ID", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_group_ID,
       { "Group ID",         "afp.group_ID",
                FT_UINT32, BASE_DEC, NULL, 0x0,
-       "Group ID", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_UUID,
       { "UUID",         "afp.uuid",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
-       "UUID", HFILL }},
+               FT_BYTES, BASE_NONE, NULL, 0x0,
+       NULL, HFILL }},
 
     { &hf_afp_GRPUUID,
       { "GRPUUID",         "afp.grpuuid",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
+               FT_BYTES, BASE_NONE, NULL, 0x0,
        "Group UUID", HFILL }},
 
     { &hf_afp_user_bitmap,
@@ -5591,17 +5591,17 @@ proto_register_afp(void)
     { &hf_afp_user_bitmap_UID,
       { "User ID",         "afp.user_bitmap.UID",
                FT_BOOLEAN, 16, NULL, 0x01,
-       "User ID", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_user_bitmap_GID,
       { "Primary group ID",         "afp.user_bitmap.GID",
                FT_BOOLEAN, 16, NULL, 0x02,
-       "Primary group ID", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_user_bitmap_UUID,
       { "UUID",         "afp.user_bitmap.UUID",
                FT_BOOLEAN, 16, NULL, 0x04,
-       "UUID", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_message_type,
       { "Type",         "afp.message_type",
@@ -5621,7 +5621,7 @@ proto_register_afp(void)
     { &hf_afp_message_bitmap_UTF,
       { "Message is UTF8",         "afp.message_bitmap.utf8",
                FT_BOOLEAN, 16, NULL, 0x02,
-        "Message is UTF8", HFILL }},
+        NULL, HFILL }},
 
     { &hf_afp_message_len,
       { "Len",         "afp.message_length",
@@ -5631,7 +5631,7 @@ proto_register_afp(void)
     { &hf_afp_message,
       { "Message",  "afp.message",
                FT_STRING, BASE_NONE, NULL, 0x0,
-       "Message", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_reqcount64,
       { "Count",         "afp.reqcount64",
@@ -5675,7 +5675,7 @@ proto_register_afp(void)
 
     { &hf_afp_extattr_data,
       { "Data",         "afp.extattr.data",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
+               FT_BYTES, BASE_NONE, NULL, 0x0,
        "Extended attribute data", HFILL }},
 
     { &hf_afp_extattr_req_count,
@@ -5691,7 +5691,7 @@ proto_register_afp(void)
     { &hf_afp_extattr_reply_size,
       { "Reply size",         "afp.extattr.reply_size",
                FT_UINT32, BASE_DEC, NULL, 0x0,
-       "Reply size", HFILL }},
+       NULL, HFILL }},
 
        /* ACL control list bitmap */
     { &hf_afp_access_bitmap,
@@ -5717,12 +5717,12 @@ proto_register_afp(void)
     { &hf_afp_acl_list_bitmap_ACL,
       { "ACL",         "afp.acl_list_bitmap.ACL",
                FT_BOOLEAN, 16, NULL, kFileSec_ACL,
-       "ACL", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_list_bitmap_REMOVEACL,
       { "Remove ACL",         "afp.acl_list_bitmap.REMOVEACL",
                FT_BOOLEAN, 16, NULL, kFileSec_REMOVEACL,
-       "Remove ACL", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_list_bitmap_Inherit,
       { "Inherit",         "afp.acl_list_bitmap.Inherit",
@@ -5737,11 +5737,11 @@ proto_register_afp(void)
     { &hf_afp_acl_flags,
       { "ACL flags",         "afp.acl_flags",
                FT_UINT32, BASE_HEX, NULL, 0,
-       "ACL flags", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_ace_applicable,
       { "ACE",         "afp.ace_applicable",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
+               FT_BYTES, BASE_NONE, NULL, 0x0,
        "ACE applicable", HFILL }},
 
     { &hf_afp_ace_rights,
@@ -5772,7 +5772,7 @@ proto_register_afp(void)
     { &hf_afp_acl_access_bitmap_delete,
       { "Delete",         "afp.acl_access_bitmap.delete",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_DELETE,
-       "Delete", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_append_data,
       { "Append data/create subdir",         "afp.acl_access_bitmap.append_data",
@@ -5787,22 +5787,22 @@ proto_register_afp(void)
     { &hf_afp_acl_access_bitmap_read_attrs,
       { "Read attributes",         "afp.acl_access_bitmap.read_attrs",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_READ_ATTRIBUTES,
-       "Read attributes", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_write_attrs,
       { "Write attributes",         "afp.acl_access_bitmap.write_attrs",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_WRITE_ATTRIBUTES,
-       "Write attributes", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_read_extattrs,
       { "Read extended attributes", "afp.acl_access_bitmap.read_extattrs",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_READ_EXTATTRIBUTES,
-       "Read extended attributes", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_write_extattrs,
       { "Write extended attributes", "afp.acl_access_bitmap.write_extattrs",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_WRITE_EXTATTRIBUTES,
-       "Write extended attributes", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_read_security,
       { "Read security",         "afp.acl_access_bitmap.read_security",
@@ -5817,32 +5817,32 @@ proto_register_afp(void)
     { &hf_afp_acl_access_bitmap_change_owner,
       { "Change owner",         "afp.acl_access_bitmap.change_owner",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_CHANGE_OWNER,
-       "Change owner", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_synchronize,
       { "Synchronize",         "afp.acl_access_bitmap.synchronize",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_SYNCHRONIZE,
-       "Synchronize", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_all,
       { "Generic all",         "afp.acl_access_bitmap.generic_all",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_ALL,
-       "Generic all", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_execute,
       { "Generic execute",         "afp.acl_access_bitmap.generic_execute",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_EXECUTE,
-       "Generic execute", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_write,
       { "Generic write",         "afp.acl_access_bitmap.generic_write",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_WRITE,
-       "Generic write", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_read,
       { "Generic read",         "afp.acl_access_bitmap.generic_read",
                FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_READ,
-       "Generic read", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_ace_flags,
       { "Flags",         "afp.ace_flags",
@@ -5862,32 +5862,32 @@ proto_register_afp(void)
     { &hf_afp_ace_flags_inherited,
       { "Inherited",         "afp.ace_flags.inherited",
                FT_BOOLEAN, 32, NULL, ACE_INHERITED,
-       "Inherited", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_ace_flags_fileinherit,
       { "File inherit",         "afp.ace_flags.file_inherit",
                FT_BOOLEAN, 32, NULL, ACE_FILE_INHERIT,
-       "File inherit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_ace_flags_dirinherit,
       { "Dir inherit",         "afp.ace_flags.directory_inherit",
                FT_BOOLEAN, 32, NULL, ACE_DIR_INHERIT,
-       "Dir inherit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_ace_flags_limitinherit,
       { "Limit inherit",         "afp.ace_flags.limit_inherit",
                FT_BOOLEAN, 32, NULL, ACE_LIMIT_INHERIT,
-       "Limit inherit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_ace_flags_onlyinherit,
       { "Only inherit",         "afp.ace_flags.only_inherit",
                FT_BOOLEAN, 32, NULL, ACE_ONLY_INHERIT,
-       "Only inherit", HFILL }},
+       NULL, HFILL }},
 
     { &hf_afp_unknown,
       { "Unknown parameter",         "afp.unknown",
-               FT_BYTES, BASE_HEX, NULL, 0x0,
-       "Unknown parameter", HFILL }},
+               FT_BYTES, BASE_NONE, NULL, 0x0,
+       NULL, HFILL }},
   };
 
   static gint *ett[] = {
index c49df61003110a3ac5beaa0c9f92d167976affac..bc5fcd0ed42c075ae4e12c9c984fa624a8f7c4a2 100644 (file)
@@ -2990,68 +2990,68 @@ proto_register_afs(void)
 {
        static hf_register_info hf[] = {
        { &hf_afs_fs, { "File Server", "afs.fs",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "File Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
        { &hf_afs_cb, { "Callback", "afs.cb",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Callback", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
        { &hf_afs_prot, { "Protection", "afs.prot",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Protection Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, "Protection Server", HFILL }},
        { &hf_afs_vldb, { "VLDB", "afs.vldb",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Location Database Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, "Volume Location Database Server", HFILL }},
        { &hf_afs_kauth, { "KAuth", "afs.kauth",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Kerberos Auth Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, "Kerberos Auth Server", HFILL }},
        { &hf_afs_vol, { "Volume Server", "afs.vol",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
        { &hf_afs_error, { "Error", "afs.error",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Error", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
        { &hf_afs_bos, { "BOS", "afs.bos",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Basic Oversee Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, "Basic Oversee Server", HFILL }},
        { &hf_afs_update, { "Update", "afs.update",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Update Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, "Update Server", HFILL }},
        { &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Rmtsys", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
        { &hf_afs_ubik, { "Ubik", "afs.ubik",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Ubik", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
        { &hf_afs_backup, { "Backup", "afs.backup",
-               FT_BOOLEAN, BASE_NONE, 0, 0, "Backup Server", HFILL }},
+               FT_BOOLEAN, BASE_NONE, 0, 0x0, "Backup Server", HFILL }},
 
        { &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(fs_req), 0, "Operation", HFILL }},
+       VALS(fs_req), 0, NULL, HFILL }},
        { &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(cb_req), 0, "Operation", HFILL }},
+       VALS(cb_req), 0, NULL, HFILL }},
        { &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(prot_req), 0, "Operation", HFILL }},
+       VALS(prot_req), 0, NULL, HFILL }},
        { &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(vldb_req), 0, "Operation", HFILL }},
+       VALS(vldb_req), 0, NULL, HFILL }},
        { &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(kauth_req), 0, "Operation", HFILL }},
+       VALS(kauth_req), 0, NULL, HFILL }},
        { &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(vol_req), 0, "Operation", HFILL }},
+       VALS(vol_req), 0, NULL, HFILL }},
        { &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(bos_req), 0, "Operation", HFILL }},
+       VALS(bos_req), 0, NULL, HFILL }},
        { &hf_afs_update_opcode, { "Operation", "afs.update.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(update_req), 0, "Operation", HFILL }},
+       VALS(update_req), 0, NULL, HFILL }},
        { &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(rmtsys_req), 0, "Operation", HFILL }},
+       VALS(rmtsys_req), 0, NULL, HFILL }},
        { &hf_afs_error_opcode, { "Operation", "afs.error.opcode",
                FT_UINT32, BASE_DEC,
-       0, 0, "Operation", HFILL }},
+       0, 0, NULL, HFILL }},
        { &hf_afs_backup_opcode, {
        "Operation", "afs.backup.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(backup_req), 0, "Operation", HFILL }},
+       VALS(backup_req), 0, NULL, HFILL }},
        { &hf_afs_ubik_opcode, {
        "Operation", "afs.ubik.opcode",
                FT_UINT32, BASE_DEC,
-       VALS(ubik_req), 0, "Operation", HFILL }},
+       VALS(ubik_req), 0, NULL, HFILL }},
 
 
 /* File Server Fields */
@@ -3066,137 +3066,137 @@ proto_register_afs(void)
        0, 0, "File ID (Uniqifier)", HFILL }},
        { &hf_afs_fs_offset, { "Offset", "afs.fs.offset",
                FT_UINT32, BASE_DEC,
-       0, 0, "Offset", HFILL }},
+       0, 0, NULL, HFILL }},
        { &hf_afs_fs_length, { "Length", "afs.fs.length",
-               FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_flength, { "FLength", "afs.fs.flength",
-               FT_UINT32, BASE_DEC, 0, 0, "FLength", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_offset64, { "Offset64", "afs.fs.offset64",
                FT_UINT64, BASE_DEC,
-       0, 0, "Offset64", HFILL }},
+       0, 0, NULL, HFILL }},
        { &hf_afs_fs_length64, { "Length64", "afs.fs.length64",
-               FT_UINT64, BASE_DEC, 0, 0, "Length64", HFILL }},
+               FT_UINT64, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_flength64, { "FLength64", "afs.fs.flength64",
-               FT_UINT64, BASE_DEC, 0, 0, "FLength64", HFILL }},
+               FT_UINT64, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_fs_data, { "Data", "afs.fs.data",
-               FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+               FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_token, { "Token", "afs.fs.token",
-               FT_BYTES, BASE_HEX, 0, 0, "Token", HFILL }},
+               FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname",
-               FT_STRING, BASE_HEX, 0, 0, "Old Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_newname, { "New Name", "afs.fs.newname",
-               FT_STRING, BASE_HEX, 0, 0, "New Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_name, { "Name", "afs.fs.name",
-               FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name",
-               FT_STRING, BASE_HEX, 0, 0, "Symlink Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content",
-               FT_STRING, BASE_HEX, 0, 0, "Symlink Content", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid",
-               FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname",
-               FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Timestamp", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg",
-               FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, "Volume Name", HFILL }},
        { &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd",
-               FT_STRING, BASE_HEX, 0, 0, "Message of the Day", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version",
-               FT_UINT32, BASE_DEC, 0, 0, "XStats Version", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion",
-               FT_UINT32, BASE_DEC, 0, 0, "Client Version", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_xstats_collnumber, { "Collection Number", "afs.fs.xstats.collnumber",
-               FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, "Collection Number", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, NULL, HFILL }},
        { &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp",
-               FT_UINT32, BASE_DEC, 0, 0, "XStats Timestamp", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1",
-               FT_UINT32, BASE_DEC, 0, 0, "CPS Spare1", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2",
-               FT_UINT32, BASE_DEC, 0, 0, "CPS Spare2", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3",
-               FT_UINT32, BASE_DEC, 0, 0, "CPS Spare3", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype",
-               FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, "Vice Lock Type", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, NULL, HFILL }},
 /* XXX - is this an IP address? */
        { &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid",
-               FT_UINT32, BASE_DEC, 0, 0, "Vice ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_ipaddr, { "IP Addr", "afs.fs.ipaddr",
-               FT_IPv4, BASE_HEX, 0, 0, "IP Addr", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 
        { &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask",
-               FT_UINT32, BASE_HEX, 0, 0, "Mask", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime",
-               FT_BOOLEAN, 32, 0, 0x00000001, "Set Modification Time", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x00000001, NULL, HFILL }},
        { &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner",
-               FT_BOOLEAN, 32, 0, 0x00000002, "Set Owner", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x00000002, NULL, HFILL }},
        { &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup",
-               FT_BOOLEAN, 32, 0, 0x00000004, "Set Group", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x00000004, NULL, HFILL }},
        { &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode",
-               FT_BOOLEAN, 32, 0, 0x00000008, "Set Mode", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x00000008, NULL, HFILL }},
        { &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize",
-               FT_BOOLEAN, 32, 0, 0x00000010, "Set Segment Size", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x00000010, NULL, HFILL }},
        { &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync",
-               FT_BOOLEAN, 32, 0, 0x00000400, "FSync", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x00000400, NULL, HFILL }},
 
        { &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Client Modification Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Server Modification Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner",
-               FT_UINT32, BASE_DEC, 0, 0, "Owner", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_group, { "Group", "afs.fs.status.group",
-               FT_UINT32, BASE_DEC, 0, 0, "Group", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode",
-               FT_UINT32, BASE_OCT, 0, 0, "Unix Mode", HFILL }},
+               FT_UINT32, BASE_OCT, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize",
-               FT_UINT32, BASE_DEC, 0, 0, "Segment Size", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion",
-               FT_UINT32, BASE_DEC, 0, 0, "Interface Version", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype",
-               FT_UINT32, BASE_DEC, 0, 0, "File Type", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_author, { "Author", "afs.fs.status.author",
-               FT_UINT32, BASE_DEC, 0, 0, "Author", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess",
-               FT_UINT32, BASE_DEC, 0, 0, "Caller Access", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess",
-               FT_UINT32, BASE_DEC, 0, 0, "Anonymous Access", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode",
-               FT_UINT32, BASE_DEC, 0, 0, "Parent VNode", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique",
-               FT_UINT32, BASE_DEC, 0, 0, "Parent Unique", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion",
-               FT_UINT32, BASE_DEC, 0, 0, "Data Version", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh",
-               FT_UINT32, BASE_DEC, 0, 0, "Data Version (High)", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount",
-               FT_UINT32, BASE_DEC, 0, 0, "Link Count", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter",
-               FT_UINT32, BASE_DEC, 0, 0, "Sync Counter", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_status_length, { "Length", "afs.fs.status.length",
-               FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
        { &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Volume Creation Timestamp", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
        { &hf_afs_fs_acl_count_positive, {
@@ -3210,7 +3210,7 @@ proto_register_afs(void)
                FT_UINT32, BASE_DEC, 0, 0, "ACL Data Size", HFILL }},
        { &hf_afs_fs_acl_entity, {
        "Entity (User/Group)", "afs.fs.acl.entity",
-               FT_STRING, BASE_HEX, 0, 0, "ACL Entity (User/Group)", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, "ACL Entity (User/Group)", HFILL }},
        { &hf_afs_fs_acl_r, {
        "_R_ead", "afs.fs.acl.r",
                FT_BOOLEAN, 8, 0, PRSFS_READ, "Read", HFILL }},
@@ -3230,184 +3230,184 @@ proto_register_afs(void)
                FT_BOOLEAN, 8, 0, PRSFS_ADMINISTER, "Administer", HFILL }},
 
        { &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version",
-               FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires",
-               FT_RELATIVE_TIME, BASE_NONE, 0, 0, "Expires", HFILL }},
+               FT_RELATIVE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type",
-               FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }},
 
 /* BOS Server Fields */
        { &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_bos_type, { "Type", "afs.bos.type",
-               FT_STRING, BASE_HEX, 0, 0, "Type", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_content, { "Content", "afs.bos.content",
-               FT_STRING, BASE_HEX, 0, 0, "Content", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_data, { "Data", "afs.bos.data",
-               FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+               FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_path, { "Path", "afs.bos.path",
-               FT_STRING, BASE_HEX, 0, 0, "Path", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_parm, { "Parm", "afs.bos.parm",
-               FT_STRING, BASE_HEX, 0, 0, "Parm", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_error, { "Error", "afs.bos.error",
-               FT_STRING, BASE_HEX, 0, 0, "Error", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1",
-               FT_STRING, BASE_HEX, 0, 0, "Spare1", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2",
-               FT_STRING, BASE_HEX, 0, 0, "Spare2", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3",
-               FT_STRING, BASE_HEX, 0, 0, "Spare3", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_file, { "File", "afs.bos.file",
-               FT_STRING, BASE_HEX, 0, 0, "File", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_cmd, { "Command", "afs.bos.cmd",
-               FT_STRING, BASE_HEX, 0, 0, "Command", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_key, { "Key", "afs.bos.key",
-               FT_BYTES, BASE_HEX, 0, 0, "key", HFILL }},
+               FT_BYTES, BASE_NONE, 0, 0, "key", HFILL }},
        { &hf_afs_bos_user, { "User", "afs.bos.user",
-               FT_STRING, BASE_HEX, 0, 0, "User", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_instance, { "Instance", "afs.bos.instance",
-               FT_STRING, BASE_HEX, 0, 0, "Instance", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_status, { "Status", "afs.bos.status",
-               FT_INT32, BASE_DEC, 0, 0, "Status", HFILL }},
+               FT_INT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc",
-               FT_STRING, BASE_DEC, 0, 0, "Status Description", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_num, { "Number", "afs.bos.number",
-               FT_UINT32, BASE_DEC, 0, 0, "Number", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_size, { "Size", "afs.bos.size",
-               FT_UINT32, BASE_DEC, 0, 0, "Size", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_flags, { "Flags", "afs.bos.flags",
-               FT_UINT32, BASE_DEC, 0, 0, "Flags", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_date, { "Date", "afs.bos.date",
-               FT_UINT32, BASE_DEC, 0, 0, "Date", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno",
-               FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_cell, { "Cell", "afs.bos.cell",
-               FT_STRING, BASE_HEX, 0, 0, "Cell", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_host, { "Host", "afs.bos.host",
-               FT_STRING, BASE_HEX, 0, 0, "Host", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "New Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Backup Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Old Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Key Modification Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum",
-               FT_UINT32, BASE_DEC, 0, 0, "Key Checksum", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2",
-               FT_UINT32, BASE_DEC, 0, 0, "Key Spare 2", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 /* KAUTH Server Fields */
        { &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ",
-               FT_STRING, BASE_HEX, 0, 0, "Principal", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm",
-               FT_STRING, BASE_HEX, 0, 0, "Realm", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain",
-               FT_STRING, BASE_HEX, 0, 0, "Domain", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_kauth_name, { "Name", "afs.kauth.name",
-               FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_kauth_data, { "Data", "afs.kauth.data",
-               FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+               FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno",
-               FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 /* VOL Server Fields */
        { &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_vol_id, { "Volume ID", "afs.vol.id",
-               FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vol_count, { "Volume Count", "afs.vol.count",
-               FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vol_name, { "Volume Name", "afs.vol.name",
-               FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 
 /* VLDB Server Fields */
        { &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type",
-               FT_UINT32, BASE_HEX, VALS(volume_types), 0, "Volume Type", HFILL }},
+               FT_UINT32, BASE_HEX, VALS(volume_types), 0, NULL, HFILL }},
        { &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id",
-               FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump",
-               FT_UINT32, BASE_DEC, 0, 0, "Bumped Volume ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index",
-               FT_UINT32, BASE_DEC, 0, 0, "Volume Index", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count",
-               FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers",
-               FT_UINT32, BASE_DEC, 0, 0, "Number of Servers", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex",
-               FT_UINT32, BASE_DEC, 0, 0, "Next Volume Index", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol",
-               FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol",
                FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
        { &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol",
                FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
        { &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol",
-               FT_UINT32, BASE_DEC, 0, 0, "Clone Volume ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name",
-               FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition",
-               FT_STRING, BASE_HEX, 0, 0, "Partition", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_server, { "Server", "afs.vldb.server",
-               FT_IPv4, BASE_HEX, 0, 0, "Server", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid",
-               FT_BYTES, BASE_HEX, 0, 0, "Server UUID", HFILL }},
+               FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq",
-               FT_UINT32, BASE_HEX, 0, 0, "Server Unique Address", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags",
-               FT_UINT32, BASE_HEX, 0, 0, "Server Flags", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip",
-               FT_IPv4, BASE_HEX, 0, 0, "Server IP", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags",
-               FT_UINT32, BASE_HEX, 0, 0, "Flags", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 
        { &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists",
-               FT_BOOLEAN, 32, 0, 0x1000, "Read/Write Exists", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x1000, NULL, HFILL }},
        { &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists",
-               FT_BOOLEAN, 32, 0, 0x2000, "Read-Only Exists", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x2000, NULL, HFILL }},
        { &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists",
-               FT_BOOLEAN, 32, 0, 0x4000, "Backup Exists", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x4000, NULL, HFILL }},
        { &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset",
-               FT_BOOLEAN, 32, 0, 0x8000, "DFS Fileset", HFILL }},
+               FT_BOOLEAN, 32, 0, 0x8000, NULL, HFILL }},
 
        { &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 1", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 7", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 8", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9",
-               FT_UINT32, BASE_DEC, 0, 0, "Spare 9", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 /* BACKUP Server Fields */
        { &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 
 /* CB Server Fields */
        { &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version",
-               FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Expires", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type",
-               FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }},
        { &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume",
                FT_UINT32, BASE_DEC, 0, 0, "File ID (Volume)", HFILL }},
        { &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode",
@@ -3417,122 +3417,122 @@ proto_register_afs(void)
 
 /* PROT Server Fields */
        { &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_prot_name, { "Name", "afs.prot.name",
-               FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+               FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_id, { "ID", "afs.prot.id",
-               FT_UINT32, BASE_DEC, 0, 0, "ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid",
-               FT_UINT32, BASE_DEC, 0, 0, "Old ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_newid, { "New ID", "afs.prot.newid",
-               FT_UINT32, BASE_DEC, 0, 0, "New ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_gid, { "Group ID", "afs.prot.gid",
-               FT_UINT32, BASE_DEC, 0, 0, "Group ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_uid, { "User ID", "afs.prot.uid",
-               FT_UINT32, BASE_DEC, 0, 0, "User ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_count, { "Count", "afs.prot.count",
-               FT_UINT32, BASE_DEC, 0, 0, "Count", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid",
-               FT_UINT32, BASE_DEC, 0, 0, "Maximum Group ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid",
-               FT_UINT32, BASE_DEC, 0, 0, "Maximum User ID", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_pos, { "Position", "afs.prot.pos",
-               FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_prot_flag, { "Flag", "afs.prot.flag",
-               FT_UINT32, BASE_HEX, 0, 0, "Flag", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 
 /* UBIK Fields */
        { &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode",
-               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
        { &hf_afs_ubik_state, { "State", "afs.ubik.state",
-               FT_UINT32, BASE_HEX, 0, 0, "State", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Epoch", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter",
-               FT_UINT32, BASE_DEC, 0, 0, "Counter", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Vote Started", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend",
-               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Vote Ends", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_file, { "File", "afs.ubik.file",
-               FT_UINT32, BASE_DEC, 0, 0, "File", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_pos, { "Position", "afs.ubik.position",
-               FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_length, { "Length", "afs.ubik.length",
-               FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+               FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype",
-               FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, "Lock Type", HFILL }},
+               FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, NULL, HFILL }},
        { &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype",
-               FT_UINT32, BASE_HEX, 0, 0, "Vote Type", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_site, { "Site", "afs.ubik.site",
-               FT_IPv4, BASE_HEX, 0, 0, "Site", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface",
-               FT_IPv4, BASE_HEX, 0, 0, "Interface Address", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 
        { &hf_afs_ubik_now, { "Now", "afs.ubik.now",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Now", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost",
-               FT_IPv4, BASE_HEX, 0, 0, "Last Yes Host", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate",
-               FT_UINT32, BASE_HEX, 0, 0, "Last Yes State", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Claim", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost",
-               FT_IPv4, BASE_HEX, 0, 0, "Lowest Host", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Lowest Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost",
-               FT_IPv4, BASE_HEX, 0, 0, "Sync Host", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_addr, { "Address", "afs.ubik.addr",
-               FT_IPv4, BASE_HEX, 0, 0, "Address", HFILL }},
+               FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Vote Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Beacon Sent", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote",
-               FT_UINT32, BASE_HEX, 0, 0, "Last Vote", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb",
-               FT_UINT32, BASE_HEX, 0, 0, "Current DB", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_up, { "Up", "afs.ubik.up",
-               FT_UINT32, BASE_HEX, 0, 0, "Up", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown",
-               FT_UINT32, BASE_HEX, 0, 0, "Beacon Since Down", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite",
-               FT_UINT32, BASE_HEX, 0, 0, "Am Sync Site", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Site Until", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers",
-               FT_UINT32, BASE_HEX, 0, 0, "Number of Servers", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages",
-               FT_UINT32, BASE_HEX, 0, 0, "Locked Pages", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages",
-               FT_UINT32, BASE_HEX, 0, 0, "Write Locked Pages", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite",
-               FT_UINT32, BASE_HEX, 0, 0, "Active Write", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter",
-               FT_UINT32, BASE_HEX, 0, 0, "TID Counter", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks",
-               FT_UINT32, BASE_HEX, 0, 0, "Any Read Locks", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks",
-               FT_UINT32, BASE_HEX, 0, 0, "Any Write Locks", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate",
-               FT_UINT32, BASE_HEX, 0, 0, "Recovery State", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran",
-               FT_UINT32, BASE_HEX, 0, 0, "Current Transaction", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran",
-               FT_UINT32, BASE_HEX, 0, 0, "Write Transaction", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime",
-               FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Epoch Time", HFILL }},
+               FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
        { &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone",
-               FT_UINT32, BASE_HEX, 0, 0, "Is Clone", HFILL }},
+               FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
        { &hf_afs_reqframe, { "Request Frame", "afs.reqframe",
-               FT_FRAMENUM, BASE_NONE, NULL, 0, "Request Frame", HFILL }},
+               FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_afs_repframe, { "Reply Frame", "afs.repframe",
-               FT_FRAMENUM, BASE_NONE, NULL, 0, "Reply Frame", HFILL }},
+               FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_afs_time, { "Time from request", "afs.time",
                FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "Time between Request and Reply for AFS calls", HFILL }},
        };
index 6c784423c83ba0ef03bb5a480fe3438f1471705c..e4c7e24671d5de7fcaa5eba493c3d4831dd35c82 100644 (file)
@@ -918,60 +918,60 @@ proto_register_agentx(void)
   static hf_register_info hf[] = {
 
     { &hf_version,
-      { "Version        ", "agentx.version", FT_UINT8, BASE_DEC, NULL, 0x0,
+      { "Version", "agentx.version", FT_UINT8, BASE_DEC, NULL, 0x0,
         "header version", HFILL }},
 
     { &hf_type,
-      { "Type           ", "agentx.type", FT_UINT8, BASE_DEC, VALS(type_values), 0x0,
+      { "Type", "agentx.type", FT_UINT8, BASE_DEC, VALS(type_values), 0x0,
         "header type", HFILL }},
 
     { &hf_flags,
-      { "Flags          ", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
+      { "Flags", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
         "header type", HFILL }},
 
     { &hf_session_id,
-      { "sessionID      ", "agentx.session_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+      { "sessionID", "agentx.session_id", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Session ID", HFILL }},
 
     { &hf_trans_id,
-      { "TransactionID  ", "agentx.transaction_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+      { "TransactionID", "agentx.transaction_id", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Transaction ID", HFILL }},
 
     { &hf_packet_id,
-      { "PacketID       ", "agentx.packet_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+      { "PacketID", "agentx.packet_id", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Packet ID", HFILL }},
 
     { &hf_payload_len,
-      { "Payload length ", "agentx.payload_len", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Payload length", HFILL }},
+      { "Payload length", "agentx.payload_len", FT_UINT32, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_ostring,
       { "Octet String", "agentx.ostring", FT_STRING, BASE_NONE, NULL, 0x0,
-        "Octet String", HFILL }},
+        NULL, HFILL }},
 
     { &hf_ostring_len,
       { "OString len", "agentx.ostring_len", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Octet String Length", HFILL }},
 
     { &hf_oid_sub,
-      { "Number subids ", "agentx.n_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Number subids", HFILL }},
+      { "Number subids", "agentx.n_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_oid_prefix,
-      { "OID prefix    ", "agentx.oid_prefix", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "OID prefix", HFILL }},
+      { "OID prefix", "agentx.oid_prefix", FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_oid_include,
-      { "OID include   ", "agentx.oid_include", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "OID include", HFILL }},
+      { "OID include", "agentx.oid_include", FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_oid_str,
-      { "OID", "agentx.oid", FT_STRING, BASE_DEC, NULL, 0x0,
-        "OID", HFILL }},
+      { "OID", "agentx.oid", FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_resp_uptime,
       { "sysUpTime", "agentx.r.uptime", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "sysUpTime", HFILL }},
+        NULL, HFILL }},
 
     { &hf_resp_error,
       { "Resp. error", "agentx.r.error", FT_UINT16, BASE_DEC, VALS(resp_errors), 0x0,
index 8079a41e19f3a38d6d7dbe536076831e16495c49..213815509b5b3e2879e2f7218af8de31a88cab97 100644 (file)
@@ -106,13 +106,13 @@ proto_register_aim_admin(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
          { &hf_admin_acctinfo_code,
-                 { "Account Information Request Code", "aim_admin.acctinfo.code", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                 { "Account Information Request Code", "aim_admin.acctinfo.code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
          },
          { &hf_admin_acctinfo_permissions,
-                 { "Account Permissions", "aim_admin.acctinfo.permissions", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                 { "Account Permissions", "aim_admin.acctinfo.permissions", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
          }, 
          { &hf_admin_confirm_status,
-                 { "Confirmation status", "aim_admin.confirm_status", FT_UINT16, BASE_HEX, VALS(confirm_statusses), 0x0, "", HFILL },
+                 { "Confirmation status", "aim_admin.confirm_status", FT_UINT16, BASE_HEX, VALS(confirm_statusses), 0x0, NULL, HFILL },
                                                                                                                                                                         },
   };
 
index 87ef0e0d8b47c30b8771556187595587991ac221..40e4f1c34241f5d49712931d67a024ae4935d958 100644 (file)
@@ -103,10 +103,10 @@ proto_register_aim_bos(void)
        /* Setup list of header fields */
        static hf_register_info hf[] = {
                { &hf_aim_bos_data,
-                       { "Data", "aim_bos.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Data", "aim_bos.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_bos_class,
-                       { "User class", "aim_bos.userclass", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "User class", "aim_bos.userclass", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
        };
 
index e5fe559b9d0681acaeb162fe3dde76c4da271dda..608c352dc5d3d80de8466336d1ddbaf6bcc00e07 100644 (file)
@@ -149,7 +149,7 @@ proto_register_aim_buddylist(void)
        /* Setup list of header fields */
        static hf_register_info hf[] = {
                { &hf_aim_userinfo_warninglevel,
-                       { "Warning Level", "aim_buddylist.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Warning Level", "aim_buddylist.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
        };
 
index 9c6aa827575421395690cb4507f5cccfb424366a..c4e17203c05c1e267f20ce6f7f63fb42431c9ae8 100644 (file)
@@ -475,95 +475,95 @@ proto_register_aim_generic(void)
        static hf_register_info hf[] = {
                { &hf_generic_servicereq_service, 
                        { "Requested Service", "aim_generic.servicereq.service", FT_UINT16,
-                               BASE_HEX, NULL, 0x0, "", HFILL },
+                               BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_motd_motdtype, 
          { "MOTD Type", "aim_generic.motd.motdtype", FT_UINT16,
-                 BASE_HEX, VALS(aim_snac_generic_motd_motdtypes), 0x0, "", HFILL },
+                 BASE_HEX, VALS(aim_snac_generic_motd_motdtypes), 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_numclasses,
-         { "Number of Rateinfo Classes", "aim_generic.rateinfo.numclasses", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Number of Rateinfo Classes", "aim_generic.rateinfo.numclasses", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_windowsize,
-         { "Window Size", "aim_generic.rateinfo.class.window_size", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Window Size", "aim_generic.rateinfo.class.window_size", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_clearlevel,
-         { "Clear Level", "aim_generic.rateinfo.class.clearlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Clear Level", "aim_generic.rateinfo.class.clearlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_alertlevel,
-         { "Alert Level", "aim_generic.rateinfo.class.alertlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Alert Level", "aim_generic.rateinfo.class.alertlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_limitlevel,
-         { "Limit Level", "aim_generic.rateinfo.class.limitlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Limit Level", "aim_generic.rateinfo.class.limitlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_disconnectlevel,
-         { "Disconnect Level", "aim_generic.rateinfo.class.disconnectlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Disconnect Level", "aim_generic.rateinfo.class.disconnectlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_currentlevel,
-         { "Current Level", "aim_generic.rateinfo.class.currentlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Current Level", "aim_generic.rateinfo.class.currentlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_maxlevel,
-      { "Max Level", "aim_generic.rateinfo.class.maxlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+      { "Max Level", "aim_generic.rateinfo.class.maxlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_lasttime,
-         { "Last Time", "aim_generic.rateinfo.class.lasttime", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Last Time", "aim_generic.rateinfo.class.lasttime", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_curstate, 
-         { "Current State", "aim_generic.rateinfo.class.curstate", FT_UINT8, BASE_HEX, VALS(rateinfo_states), 0x0, "", HFILL },
+         { "Current State", "aim_generic.rateinfo.class.curstate", FT_UINT8, BASE_HEX, VALS(rateinfo_states), 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_classid,
-         { "Class ID", "aim_generic.rateinfo.class.id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Class ID", "aim_generic.rateinfo.class.id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfo_numpairs,
-         { "Number of Family/Subtype pairs", "aim_generic.rateinfo.class.numpairs", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Number of Family/Subtype pairs", "aim_generic.rateinfo.class.numpairs", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_rateinfoack_group,
-         { "Acknowledged Rate Class", "aim_generic.rateinfoack.class", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Acknowledged Rate Class", "aim_generic.rateinfoack.class", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_ratechange_msg,
-         { "Rate Change Message", "aim_generic.ratechange.msg", FT_UINT16, BASE_HEX, VALS(ratechange_msgs), 0x0, "", HFILL },
+         { "Rate Change Message", "aim_generic.ratechange.msg", FT_UINT16, BASE_HEX, VALS(ratechange_msgs), 0x0, NULL, HFILL },
        },
        { &hf_generic_migration_numfams,
-         { "Number of families to migrate", "aim_generic.migrate.numfams", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Number of families to migrate", "aim_generic.migrate.numfams", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_priv_flags,
-         { "Privilege flags", "aim_generic.privilege_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+         { "Privilege flags", "aim_generic.privilege_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_allow_idle_see,
-         { "Allow other users to see idle time", "aim_generic.privilege_flags.allow_idle", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0001, "", HFILL },
+         { "Allow other users to see idle time", "aim_generic.privilege_flags.allow_idle", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0001, NULL, HFILL },
        },
        { &hf_generic_allow_member_see,
-         { "Allow other users to see how long account has been a member", "aim_generic.privilege_flags.allow_member", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0002, "", HFILL },
+         { "Allow other users to see how long account has been a member", "aim_generic.privilege_flags.allow_member", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0002, NULL, HFILL },
        },
        { &hf_generic_selfinfo_warninglevel,
-               { "Warning level", "aim_generic.selfinfo.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Warning level", "aim_generic.selfinfo.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_evil_new_warn_level,
-               { "New warning level", "aim_generic.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "New warning level", "aim_generic.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_idle_time,
-               { "Idle time (seconds)", "aim_generic.idle_time", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Idle time (seconds)", "aim_generic.idle_time", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_client_ver_req_offset, 
-               { "Client Verification Request Offset", "aim_generic.client_verification.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Client Verification Request Offset", "aim_generic.client_verification.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_client_ver_req_length, 
-               { "Client Verification Request Length", "aim_generic.client_verification.length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Client Verification Request Length", "aim_generic.client_verification.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_client_ver_req_hash,
-               { "Client Verification MD5 Hash", "aim_generic.client_verification.hash", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Client Verification MD5 Hash", "aim_generic.client_verification.hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
        },
        { &hf_generic_ext_status_type,
-               { "Extended Status Type", "aim_generic.ext_status.type", FT_UINT16, BASE_DEC, VALS(ext_status_types), 0x0, "", HFILL },
+               { "Extended Status Type", "aim_generic.ext_status.type", FT_UINT16, BASE_DEC, VALS(ext_status_types), 0x0, NULL, HFILL },
        },
        { &hf_generic_ext_status_flags,
-               { "Extended Status Flags", "aim_generic.ext_status.flags", FT_UINT8, BASE_HEX, VALS(ext_status_flags), 0x0, "", HFILL },
+               { "Extended Status Flags", "aim_generic.ext_status.flags", FT_UINT8, BASE_HEX, VALS(ext_status_flags), 0x0, NULL, HFILL },
        },
        { &hf_generic_ext_status_length,
-               { "Extended Status Length", "aim_generic.ext_status.length", FT_UINT8, BASE_HEX, NULL, 0x0, "" , HFILL },
+               { "Extended Status Length", "aim_generic.ext_status.length", FT_UINT8, BASE_HEX, NULL, 0x0, NULL , HFILL },
        },
        { &hf_generic_ext_status_data,
-               { "Extended Status Data", "aim_generic.ext_status.data", FT_BYTES, BASE_HEX, NULL, 0x0, "" , HFILL },
+               { "Extended Status Data", "aim_generic.ext_status.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL , HFILL },
        },
 
   };
index e41800d2e94aad35fa6381c8358b97a998a44e66..8ac5809773eb5fbe1889108c8fc84f2812d07d00 100644 (file)
@@ -222,22 +222,22 @@ proto_register_aim_icq(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
          { &hf_icq_tlv_data_chunk_size,
-           { "Data chunk size", "aim_icq.chunk_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+           { "Data chunk size", "aim_icq.chunk_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
          },
          { &hf_icq_tlv_request_owner_uid,
-           { "Owner UID", "aim_icq.owner_uid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL},
+           { "Owner UID", "aim_icq.owner_uid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL},
          },
          { &hf_icq_tlv_request_type,
-           {"Request Type", "aim_icq.request_type", FT_UINT16, BASE_DEC, VALS(aim_icq_data_types), 0x0, "", HFILL},
+           {"Request Type", "aim_icq.request_type", FT_UINT16, BASE_DEC, VALS(aim_icq_data_types), 0x0, NULL, HFILL},
          },
          { &hf_icq_tlv_request_seq_num,
-           {"Request Sequence Number", "aim_icq.request_seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL},
+           {"Request Sequence Number", "aim_icq.request_seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL},
          },
          { &hf_icq_dropped_msg_flag,
-               {"Dropped messages flag", "aim_icq.offline_msgs.dropped_flag", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL },
+               {"Dropped messages flag", "aim_icq.offline_msgs.dropped_flag", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL },
          },
          { &hf_icq_meta_subtype,
-               {"Meta Request Subtype", "aim_icq.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+               {"Meta Request Subtype", "aim_icq.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
          },
   };
 
index b148a2636b899ecaba3fc6663fdd2fb2eb0a43d4..c6861ddc7ce20808ce02deafd2ba47c8e5291da0 100644 (file)
@@ -193,17 +193,17 @@ proto_register_aim_location(void)
        /* Setup list of header fields */
        static hf_register_info hf[] = {
                { &hf_aim_buddyname_len,
-                       { "Buddyname len", "aim_location.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+                       { "Buddyname len", "aim_location.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_buddyname,
-                       { "Buddy Name", "aim_location.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+                       { "Buddy Name", "aim_location.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_userinfo_warninglevel,
-                       { "Warning Level", "aim_location.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Warning Level", "aim_location.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_snac_location_request_user_info_infotype,
                        { "Infotype", "aim_location.snac.request_user_info.infotype", FT_UINT16, BASE_HEX, VALS(aim_snac_location_request_user_info_infotypes), 0x0,
-                               "", HFILL }
+                               NULL, HFILL }
                },
        };
 
index 5c91d1573dbdab3f728df41959399a8b3bebee82..57226edf39b64bae50b88d87d1ccd4d1c367245c 100644 (file)
@@ -591,85 +591,85 @@ proto_register_aim_messaging(void)
        /* Setup list of header fields */
        static hf_register_info hf[] = {
                { &hf_aim_icbm_channel,
-                       { "Channel to setup", "aim_messaging.icbm.channel", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Channel to setup", "aim_messaging.icbm.channel", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_msg_flags,
-                       { "Message Flags", "aim_messaging.icbm.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Message Flags", "aim_messaging.icbm.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_max_snac_size,
-                       { "Max SNAC Size", "aim_messaging.icbm.max_snac", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Max SNAC Size", "aim_messaging.icbm.max_snac", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_max_sender_warnlevel,
-                       { "Max sender warn level", "aim_messaging.icbm.max_sender_warn-level", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Max sender warn level", "aim_messaging.icbm.max_sender_warn-level", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_max_receiver_warnlevel,
-                       { "max receiver warn level", "aim_messaging.icbm.max_receiver_warnlevel", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "max receiver warn level", "aim_messaging.icbm.max_receiver_warnlevel", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_min_msg_interval,
-                       { "Minimum message interval (milliseconds)", "aim_messaging.icbm.min_msg_interval", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Minimum message interval (milliseconds)", "aim_messaging.icbm.min_msg_interval", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_cookie,
-                       { "ICBM Cookie", "aim_messaging.icbmcookie", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "ICBM Cookie", "aim_messaging.icbmcookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_message_channel_id,
-                       { "Message Channel ID", "aim_messaging.channelid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Message Channel ID", "aim_messaging.channelid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_icbm_evil,
-                       { "Send Evil Bit As", "aim_messaging.evilreq.origin", FT_UINT16, BASE_DEC, VALS(evil_origins), 0x0, "", HFILL },
+                       { "Send Evil Bit As", "aim_messaging.evilreq.origin", FT_UINT16, BASE_DEC, VALS(evil_origins), 0x0, NULL, HFILL },
                },
                { &hf_aim_evil_warn_level,
-                       { "Old warning level", "aim_messaging.evil.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Old warning level", "aim_messaging.evil.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_evil_new_warn_level,
-                       { "New warning level", "aim_messaging.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "New warning level", "aim_messaging.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_notification_cookie,
-                       { "Notification Cookie", "aim_messaging.notification.cookie", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Notification Cookie", "aim_messaging.notification.cookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_notification_channel,
-                       { "Notification Channel", "aim_messaging.notification.channel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Notification Channel", "aim_messaging.notification.channel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_notification_type,
-                       { "Notification Type", "aim_messaging.notification.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Notification Type", "aim_messaging.notification.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_msg_type,
-                       { "Message Type", "aim_messaging.rendezvous.msg_type", FT_UINT16, BASE_HEX, VALS(rendezvous_msg_types), 0x0, "", HFILL },
+                       { "Message Type", "aim_messaging.rendezvous.msg_type", FT_UINT16, BASE_HEX, VALS(rendezvous_msg_types), 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_clientautoresp_reason,
-                       { "Reason", "aim_messaging.clientautoresp.reason", FT_UINT16, BASE_DEC, VALS(clientautoresp_reason_types), 0x0, "", HFILL },
+                       { "Reason", "aim_messaging.clientautoresp.reason", FT_UINT16, BASE_DEC, VALS(clientautoresp_reason_types), 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_clientautoresp_protocol_version,
-                       { "Version", "aim_messaging.clientautoresp.protocol_version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Version", "aim_messaging.clientautoresp.protocol_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_icbm_clientautoresp_client_caps_flags,
-                       { "Client Capabilities Flags", "aim_messaging.clientautoresp.client_caps_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Client Capabilities Flags", "aim_messaging.clientautoresp.client_caps_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_type,
-                       { "Message Type", "aim_messaging.icbm.extended_data.message.type", FT_UINT8, BASE_HEX, VALS(extended_data_message_types), 0x0, "", HFILL },
+                       { "Message Type", "aim_messaging.icbm.extended_data.message.type", FT_UINT8, BASE_HEX, VALS(extended_data_message_types), 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_flags,
-                       { "Message Flags", "aim_messaging.icbm.extended_data.message.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Message Flags", "aim_messaging.icbm.extended_data.message.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_flags_normal,
-                       { "Normal Message", "aim_messaging.icbm.extended_data.message.flags.normal", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_NORMAL, "", HFILL },
+                       { "Normal Message", "aim_messaging.icbm.extended_data.message.flags.normal", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_NORMAL, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_flags_auto,
-                       { "Auto Message", "aim_messaging.icbm.extended_data.message.flags.auto", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_AUTO, "", HFILL },
+                       { "Auto Message", "aim_messaging.icbm.extended_data.message.flags.auto", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_AUTO, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_flags_multi,
-                       { "Multiple Recipients Message", "aim_messaging.icbm.rendezvous.extended_data.message.flags.multi", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_MULTI, "", HFILL },
+                       { "Multiple Recipients Message", "aim_messaging.icbm.rendezvous.extended_data.message.flags.multi", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_MULTI, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_status_code,
-                       { "Status Code", "aim_messaging.icbm.extended_data.message.status_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Status Code", "aim_messaging.icbm.extended_data.message.status_code", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_priority_code,
-                       { "Priority Code", "aim_messaging.icbm.extended_data.message.priority_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Priority Code", "aim_messaging.icbm.extended_data.message.priority_code", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_text_length,
-                       { "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                       { "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
                },
                { &hf_aim_rendezvous_extended_data_message_text,
-                       { "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL },
+                       { "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL },
                }
        };
 
index 687a8b0c91315d1ab9f3bc018cc74f946f55cd51..25f9f144963176dd27ca8199c7f6956233dcc1b1 100644 (file)
@@ -161,13 +161,13 @@ proto_register_aim_signon(void)
        /* Setup list of header fields */
        static hf_register_info hf[] = {
                { &hf_aim_infotype,
-                       { "Infotype", "aim_signon.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Infotype", "aim_signon.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_signon_challenge_len,
-                       { "Signon challenge length", "aim_signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+                       { "Signon challenge length", "aim_signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_signon_challenge,
-                       { "Signon challenge", "aim_signon.challenge", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Signon challenge", "aim_signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
        };
 
index b028cb54a62c22950cc7936322e93bb600d53baf..63a344a85be922b1a15cc49f8a98c2332747c287 100644 (file)
@@ -337,49 +337,49 @@ proto_register_aim_ssi(void)
        /* Setup list of header fields */
        static hf_register_info hf[] = {
                { &hf_aim_fnac_subtype_ssi_version,
-                       { "SSI Version", "aim_ssi.fnac.version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Version", "aim_ssi.fnac.version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_numitems,
-                       { "SSI Object count", "aim_ssi.fnac.numitems", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Object count", "aim_ssi.fnac.numitems", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_last_change_time,
-                       { "SSI Last Change Time", "aim_ssi.fnac.last_change_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }
+                       { "SSI Last Change Time", "aim_ssi.fnac.last_change_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_buddyname_len,
-                       { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_buddyname,
-                       { "Buddy Name", "aim_ssi.fnac.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+                       { "Buddy Name", "aim_ssi.fnac.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_gid,
-                       { "SSI Buddy Group ID", "aim_ssi.fnac.gid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Buddy Group ID", "aim_ssi.fnac.gid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_bid,
-                       { "SSI Buddy ID", "aim_ssi.fnac.bid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Buddy ID", "aim_ssi.fnac.bid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_type,
-                       { "SSI Buddy type", "aim_ssi.fnac.type", FT_UINT16, BASE_HEX, VALS(aim_fnac_family_ssi_types), 0x0, "", HFILL }
+                       { "SSI Buddy type", "aim_ssi.fnac.type", FT_UINT16, BASE_HEX, VALS(aim_fnac_family_ssi_types), 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_tlvlen,
-                       { "SSI TLV Len", "aim_ssi.fnac.tlvlen", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI TLV Len", "aim_ssi.fnac.tlvlen", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_data,
-                       { "SSI Buddy Data", "aim_ssi.fnac.data", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Buddy Data", "aim_ssi.fnac.data", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_buddyname_len8,
-                       { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len8", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len8", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_reason_str_len,
-                       { "Reason Message length", "aim_ssi.fnac.reason_len", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Reason Message length", "aim_ssi.fnac.reason_len", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_reason_str,
-                       { "Reason Message", "aim_ssi.fnac.reason", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+                       { "Reason Message", "aim_ssi.fnac.reason", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_grant_auth_unkn,
-                       { "Unknown", "aim_ssi.fnac.auth_unkn", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Unknown", "aim_ssi.fnac.auth_unkn", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
                { &hf_aim_fnac_subtype_ssi_allow_auth,
-                       { "Allow flag", "aim_ssi.fnac.allow_auth_flag", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+                       { "Allow flag", "aim_ssi.fnac.allow_auth_flag", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
                },
        };
 
index f8d285d39312a00e251199bd963fe8a0ba9f927c..c573a09cd27e28acdbc1b674d1efc2e0454a8d3f 100644 (file)
@@ -160,22 +160,22 @@ proto_register_aim_sst(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
          { &hf_aim_sst_md5_hash,
-                 { "MD5 Hash", "aim_sst.md5", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+                 { "MD5 Hash", "aim_sst.md5", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
          }, 
          { &hf_aim_sst_md5_hash_size,
-                 { "MD5 Hash Size", "aim_sst.md5.size", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL },
+                 { "MD5 Hash Size", "aim_sst.md5.size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL },
          },
          { &hf_aim_sst_unknown,
-                 { "Unknown Data", "aim_sst.unknown", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+                 { "Unknown Data", "aim_sst.unknown", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
          },
          { &hf_aim_sst_ref_num,
-                 { "Reference Number", "aim_sst.ref_num", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+                 { "Reference Number", "aim_sst.ref_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
          },
          { &hf_aim_sst_icon_size,
-                 { "Icon Size", "aim_sst.icon_size", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+                 { "Icon Size", "aim_sst.icon_size", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
          },
          { &hf_aim_sst_icon,
-                 { "Icon", "aim_sst.icon", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+                 { "Icon", "aim_sst.icon", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
          },
   };
 
index d0c7ec72f777443ab14d0c9a590dc866985c0396..7b15b9d1a1708243713e267c791b23860028724d 100644 (file)
@@ -1441,184 +1441,184 @@ proto_register_aim(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
     { &hf_aim_cmd_start,
-      { "Command Start", "aim.cmd_start", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Command Start", "aim.cmd_start", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_channel,
-      { "Channel ID", "aim.channel", FT_UINT8, BASE_HEX, VALS(aim_flap_channels), 0x0, "", HFILL }
+      { "Channel ID", "aim.channel", FT_UINT8, BASE_HEX, VALS(aim_flap_channels), 0x0, NULL, HFILL }
     },
     { &hf_aim_seqno,
-      { "Sequence Number", "aim.seqno", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Sequence Number", "aim.seqno", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
        { &hf_aim_version,
-         { "Protocol Version", "aim.version", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL },
+         { "Protocol Version", "aim.version", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_data_len,
-      { "Data Field Length", "aim.datalen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Data Field Length", "aim.datalen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_data,
-      { "Data", "aim.data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Data", "aim.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_signon_challenge_len,
-      { "Signon challenge length", "aim.signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Signon challenge length", "aim.signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_signon_challenge,
-      { "Signon challenge", "aim.signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Signon challenge", "aim.signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_family,
-      { "FNAC Family ID", "aim.fnac.family", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC Family ID", "aim.fnac.family", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_subtype,
-      { "FNAC Subtype ID", "aim.fnac.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC Subtype ID", "aim.fnac.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_flags,
-      { "FNAC Flags", "aim.fnac.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC Flags", "aim.fnac.flags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_id,
-      { "FNAC ID", "aim.fnac.id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC ID", "aim.fnac.id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_infotype,
-      { "Infotype", "aim.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Infotype", "aim.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_buddyname_len,
-      { "Buddyname len", "aim.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Buddyname len", "aim.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_buddyname,
-      { "Buddy Name", "aim.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Buddy Name", "aim.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_tlvcount,
-      { "TLV Count", "aim.tlvcount", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+      { "TLV Count", "aim.tlvcount", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
     },
        { &hf_aim_snac_error,
-         { "SNAC Error", "aim.snac.error", FT_UINT16, BASE_HEX, VALS(aim_snac_errors), 0x0, "", HFILL },
+         { "SNAC Error", "aim.snac.error", FT_UINT16, BASE_HEX, VALS(aim_snac_errors), 0x0, NULL, HFILL },
        },
        { &hf_aim_userclass_unconfirmed,
-               { "AOL Unconfirmed account flag", "aim.userclass.unconfirmed", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNCONFIRMED, "", HFILL },
+               { "AOL Unconfirmed account flag", "aim.userclass.unconfirmed", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNCONFIRMED, NULL, HFILL },
        },
        { &hf_aim_userclass_administrator,
-               { "AOL Administrator flag", "aim.userclass.administrator", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ADMINISTRATOR, "", HFILL },
+               { "AOL Administrator flag", "aim.userclass.administrator", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ADMINISTRATOR, NULL, HFILL },
        },
        { &hf_aim_userclass_aol,
-               { "AOL Staff User Flag", "aim.userclass.staff", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AOL, "", HFILL },
+               { "AOL Staff User Flag", "aim.userclass.staff", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AOL, NULL, HFILL },
        },
        { &hf_aim_userclass_commercial,
-               { "AOL commercial account flag", "aim.userclass.commercial", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_COMMERCIAL, "", HFILL },
+               { "AOL commercial account flag", "aim.userclass.commercial", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_COMMERCIAL, NULL, HFILL },
        },
        { &hf_aim_userclass_aim,
-               { "AIM user flag", "aim.userclass.free", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AIM, "", HFILL },
+               { "AIM user flag", "aim.userclass.free", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AIM, NULL, HFILL },
        },
        { &hf_aim_userclass_away,
-               { "AOL away status flag", "aim.userclass.away", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AWAY, "", HFILL },
+               { "AOL away status flag", "aim.userclass.away", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AWAY, NULL, HFILL },
        },
        { &hf_aim_userclass_icq,
-               { "ICQ user sign", "aim.userclass.icq", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ICQ, "", HFILL },
+               { "ICQ user sign", "aim.userclass.icq", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ICQ, NULL, HFILL },
        },
        { &hf_aim_userclass_wireless,
-               { "AOL wireless user", "aim.userclass.wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_WIRELESS, "", HFILL },
+               { "AOL wireless user", "aim.userclass.wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_WIRELESS, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown100,
-               { "Unknown bit", "aim.userclass.unknown100", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN100, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown100", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN100, NULL, HFILL },
        },
        { &hf_aim_userclass_imf,
-               { "Using IM Forwarding", "aim.userclass.imf", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_IMF, "", HFILL },
+               { "Using IM Forwarding", "aim.userclass.imf", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_IMF, NULL, HFILL },
        },
        { &hf_aim_userclass_bot,
-               { "Bot User", "aim.userclass.bot", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_BOT, "", HFILL },
+               { "Bot User", "aim.userclass.bot", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_BOT, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown800,
-               { "Unknown bit", "aim.userclass.unknown800", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN800, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown800", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN800, NULL, HFILL },
        },
        { &hf_aim_userclass_one_way_wireless,
-               { "One Way Wireless Device", "aim.userclass.one_way_wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ONE_WAY_WIRELESS, "", HFILL },
+               { "One Way Wireless Device", "aim.userclass.one_way_wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ONE_WAY_WIRELESS, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown2000,
-               { "Unknown bit", "aim.userclass.unknown2000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN2000, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown2000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN2000, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown4000,
-               { "Unknown bit", "aim.userclass.unknown4000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN4000, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown4000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN4000, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown8000,
-               { "Unknown bit", "aim.userclass.unknown8000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN8000, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown8000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN8000, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown10000,
-               { "Unknown bit", "aim.userclass.unknown10000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN10000, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown10000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN10000, NULL, HFILL },
        },
        { &hf_aim_userclass_unknown20000,
-               { "Unknown bit", "aim.userclass.unknown20000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN20000, "", HFILL },
+               { "Unknown bit", "aim.userclass.unknown20000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN20000, NULL, HFILL },
        },
        { &hf_aim_userclass_no_knock_knock,
-               { "Do not display the 'not on Buddy List' knock-knock", "aim.userclass.no_knock_knock", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_NO_KNOCK_KNOCK, "", HFILL },
+               { "Do not display the 'not on Buddy List' knock-knock", "aim.userclass.no_knock_knock", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_NO_KNOCK_KNOCK, NULL, HFILL },
        },
        { &hf_aim_userclass_forward_mobile,
-               { "Forward to mobile if not active", "aim.userclass.forward_mobile", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_FORWARD_MOBILE, "", HFILL },
+               { "Forward to mobile if not active", "aim.userclass.forward_mobile", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_FORWARD_MOBILE, NULL, HFILL },
        },
        { &hf_aim_fnac_flag_next_is_related,
-               { "Followed By SNAC with related information", "aim.fnac.flags.next_is_related", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_NEXT_IS_RELATED, "", HFILL },
+               { "Followed By SNAC with related information", "aim.fnac.flags.next_is_related", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_NEXT_IS_RELATED, NULL, HFILL },
        },
        { &hf_aim_fnac_flag_contains_version,
-               { "Contains Version of Family this SNAC is in", "aim.fnac.flags.contains_version", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_CONTAINS_VERSION, "", HFILL },
+               { "Contains Version of Family this SNAC is in", "aim.fnac.flags.contains_version", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_CONTAINS_VERSION, NULL, HFILL },
        },
        { &hf_aim_userinfo_warninglevel,
-               { "Warning Level", "aim.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Warning Level", "aim.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_featuresdes,
-               { "Features", "aim.messageblock.featuresdes", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+               { "Features", "aim.messageblock.featuresdes", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_featureslen,
-               { "Features Length", "aim.messageblock.featureslen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Features Length", "aim.messageblock.featureslen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_features,
-               { "Features", "aim.messageblock.features", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+               { "Features", "aim.messageblock.features", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_info,
-               { "Block info", "aim.messageblock.info", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+               { "Block info", "aim.messageblock.info", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_len,
-               { "Block length", "aim.messageblock.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+               { "Block length", "aim.messageblock.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_charset,
-               { "Block Character set", "aim.messageblock.charset", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+               { "Block Character set", "aim.messageblock.charset", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_charsubset,
-               { "Block Character subset", "aim.messageblock.charsubset", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+               { "Block Character subset", "aim.messageblock.charsubset", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
        },
     { &hf_aim_messageblock_message,
-