(Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL.

svn path=/trunk/; revision=34230

25 files changed, 108 insertions, 108 deletions

diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 0aaef90d39..f99193c0fc 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -5165,7 +5165,7 @@ proto_register_afp(void)
 		{ &hf_afp_file_attribute_MultiUser,
 		  { "Multi user",         "afp.file_attribute.multi_user",
 		    FT_BOOLEAN, 16, NULL,  kFPMultiUserBit,
-		    "multi user", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_afp_file_attribute_System,
 		  { "System",         	 "afp.file_attribute.system",
@@ -5195,17 +5195,17 @@ proto_register_afp(void)
 		{ &hf_afp_file_attribute_RenameInhibit,
 		  { "Rename inhibit",         "afp.file_attribute.rename_inhibit",
 		    FT_BOOLEAN, 16, NULL,  kFPRenameInhibitBit,
-		    "rename inhibit", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_afp_file_attribute_DeleteInhibit,
 		  { "Delete inhibit",         "afp.file_attribute.delete_inhibit",
 		    FT_BOOLEAN, 16, NULL,  kFPDeleteInhibitBit,
-		    "delete inhibit", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_afp_file_attribute_CopyProtect,
 		  { "Copy protect",         "afp.file_attribute.copy_protect",
 		    FT_BOOLEAN, 16, NULL,  kFPCopyProtectBit,
-		    "copy protect", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_afp_file_attribute_SetClear,
 		  { "Set",         "afp.file_attribute.set_clear",
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c
index 04cab02416..c5890439c9 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-btobex.c
@@ -605,12 +605,12 @@ proto_register_btobex(void)
         {&hf_response_code,
             {"Response Code", "btobex.resp_code",
             FT_UINT8, BASE_HEX, VALS(code_vals), BTOBEX_CODE_VALS_MASK,
-            "Response Code", HFILL}
+            NULL, HFILL}
         },
         {&hf_final_flag,
             {"Final Flag", "btobex.final_flag",
             FT_BOOLEAN, BASE_HEX, TFS(&true_false), 0x80,
-            "Final Flag", HFILL}
+            NULL, HFILL}
         },
         {&hf_length,
             {"Packet Length", "btobex.pkt_len",
@@ -640,12 +640,12 @@ proto_register_btobex(void)
         {&hf_set_path_flags_0,
             {"Go back one folder (../) first", "btobex.set_path_flags_0",
             FT_BOOLEAN, 8, TFS(&true_false), 0x01,
-            "Go back one folder (../) first", HFILL}
+            NULL, HFILL}
         },
         {&hf_set_path_flags_1,
             {"Do not create folder, if not existing", "btobex.set_path_flags_1",
             FT_BOOLEAN, 8, TFS(&true_false), 0x02,
-            "Do not create folder, if not existing", HFILL}
+            NULL, HFILL}
         },
         {&hf_hdr_id,
             {"Header Id", "btobex.hdr_id",
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index e9b33a1be2..f3c2baab5f 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -8790,7 +8790,7 @@ proto_register_dcerpc_netlogon(void)
           { "Not used 80000000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_80000000, "Not used", HFILL }},
 
         { &hf_netlogon_neg_flags_40000000,
-          { "Authenticated RPC supported", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_40000000, "Authenticated RPC supported", HFILL }},
+          { "Authenticated RPC supported", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_40000000, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_20000000,
           { "Authenticated RPC via lsass supported", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_20000000, "rpc via lsass", HFILL }},
@@ -8823,7 +8823,7 @@ proto_register_dcerpc_netlogon(void)
           { "NO NT4 emulation", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_100000, "No NT4 emu", HFILL }},
 
         { &hf_netlogon_neg_flags_80000,
-          { "Cross forest trust", "ntlmssp.neg_flags.na80000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_80000, "Cross forest trust", HFILL }},
+          { "Cross forest trust", "ntlmssp.neg_flags.na80000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_80000, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_40000,
           { "GetDomainInfo supported", "ntlmssp.neg_flags.na40000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_40000, "GetDomainInfo", HFILL }},
@@ -8838,34 +8838,34 @@ proto_register_dcerpc_netlogon(void)
           { "Transitive trusts", "ntlmssp.neg_flags.na8000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_8000, "Transitive trust", HFILL }},
 
         { &hf_netlogon_neg_flags_4000,
-          { "Strong key", "ntlmssp.neg_flags.na4000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_STRONGKEY, "Strong key", HFILL }},
+          { "Strong key", "ntlmssp.neg_flags.na4000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_STRONGKEY, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_2000,
-          { "Avoid replication Auth database", "ntlmssp.neg_flags.na2000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2000, "Avoid replication auth database", HFILL }},
+          { "Avoid replication Auth database", "ntlmssp.neg_flags.na2000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2000, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_1000,
-          { "Avoid replication account database", "ntlmssp.neg_flags.na1000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000, "Avoid replication account database", HFILL }},
+          { "Avoid replication account database", "ntlmssp.neg_flags.na1000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_800,
-          { "Concurent RPC", "ntlmssp.neg_flags.na800", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_800, "Concurent RPC", HFILL }},
+          { "Concurent RPC", "ntlmssp.neg_flags.na800", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_800, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_400,
-          { "Generic pass-through", "ntlmssp.neg_flags.na400", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_400, "Generic pass-through", HFILL }},
+          { "Generic pass-through", "ntlmssp.neg_flags.na400", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_400, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_200,
-          { "SendToSam", "ntlmssp.neg_flags.na200", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_200, "SendToSam", HFILL }},
+          { "SendToSam", "ntlmssp.neg_flags.na200", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_200, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_100,
           { "Refusal of password change", "ntlmssp.neg_flags.na100", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_100, "PWD change refusal", HFILL }},
 
         { &hf_netlogon_neg_flags_80,
-          { "DatabaseRedo call", "ntlmssp.neg_flags.na80", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_80, "DatabaseRedo call", HFILL }},
+          { "DatabaseRedo call", "ntlmssp.neg_flags.na80", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_80, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_40,
-          { "Handle multiple SIDs", "ntlmssp.neg_flags.na40", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_40, "Handle multiple SIDs", HFILL }},
+          { "Handle multiple SIDs", "ntlmssp.neg_flags.na40", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_40, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_20,
-          { "Restarting full DC sync", "ntlmssp.neg_flags.na20", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_20, "Restarting full DC sync", HFILL }},
+          { "Restarting full DC sync", "ntlmssp.neg_flags.na20", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_20, NULL, HFILL }},
 
         { &hf_netlogon_neg_flags_10,
           { "BDC handling Changelogs", "ntlmssp.neg_flags.na10", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_10, "BDC Changelog", HFILL }},
@@ -8880,7 +8880,7 @@ proto_register_dcerpc_netlogon(void)
           { "NT3.5 BDC continious update", "ntlmssp.neg_flags.na2", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2, "NT3.5", HFILL }},
 
         { &hf_netlogon_neg_flags_1,
-          { "Account lockout", "ntlmssp.neg_flags.na1", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1, "Account lockout", HFILL }},
+          { "Account lockout", "ntlmssp.neg_flags.na1", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1, NULL, HFILL }},
 
         { &hf_netlogon_dc_flags,
           { "Domain Controller Flags", "netlogon.dc.flags", FT_UINT32, BASE_HEX,
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index ddb03c4e07..4abb3bcadd 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -3629,11 +3629,11 @@ void proto_register_dmp (void)
     { &hf_envelope_content_id_discarded,
       { "Content Identifier discarded", "dmp.cont_id_discarded",
         FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x80,
-        "Content identifier discarded", HFILL } },
+        NULL, HFILL } },
     { &hf_envelope_recip_reassign_prohib,
       { "Recipient reassign prohibited","dmp.recip_reassign_prohib",
         FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x40,
-        "Recipient Reassign prohibited", HFILL }},
+        NULL, HFILL }},
     { &hf_envelope_dl_expansion_prohib,
       { "DL expansion prohibited", "dmp.dl_expansion_prohib",
         FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, NULL,
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 1723f27425..98abb50ce7 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -3531,7 +3531,7 @@ proto_register_dns(void)
     { &hf_dns_nsec3_flag_optout,
       { "NSEC3 Opt-out flag", "dns.nsec3.flags.opt_out",
         FT_BOOLEAN, 8, TFS(&tfs_flags_nsec3_optout), NSEC3_FLAG_OPTOUT,
-        "NSEC3 opt-out flag", HFILL }},
+        NULL, HFILL }},
     { &hf_dns_nsec3_iterations,
       { "NSEC3 iterations", "dns.nsec3.iterations",
         FT_UINT16, BASE_DEC, NULL, 0,
@@ -3623,11 +3623,11 @@ proto_register_dns(void)
     { &hf_dns_apl_negation,
       { "Negation Flag", "dns.apl.negation",
         FT_BOOLEAN, 8, TFS(&tfs_dns_apl_negation), DNS_APL_NEGATION,
-        "Negation Flag", HFILL }},
+        NULL, HFILL }},
     { &hf_dns_apl_afdlength,
       { "Address Length, in octets","dns.apl.afdlength",
         FT_UINT8, BASE_DEC, NULL, DNS_APL_AFDLENGTH,
-        "Address Length, in octets", HFILL }},
+        NULL, HFILL }},
     { &hf_dns_nsap_rdata,
       { "NSAP Data", "dns.nsap.rdata",
         FT_BYTES, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index 4436abf461..cc0d6f030c 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -1247,7 +1247,7 @@ void proto_register_dplay(void)
         TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_CREATE_PLAYERS, "No Create Players", HFILL}},
     { &hf_dplay_flags_0002,
         { "unused", "dplay.flags.unused", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_FLAG_0002, "Unused", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_FLAG_0002, NULL, HFILL}},
     { &hf_dplay_flags_migrate_host,
         { "migrate host flag", "dplay.flags.migrate_host", FT_BOOLEAN, 32,
         TFS(&tfs_dplay_flag), DPLAY_FLAG_MIGRATE_HOST, "Migrate Host", HFILL}},
@@ -1256,16 +1256,16 @@ void proto_register_dplay(void)
         TFS(&tfs_dplay_flag), DPLAY_FLAG_SHORT_PLAYER_MSG, "Short Player Msg", HFILL}},
     { &hf_dplay_flags_ignored,
         { "ignored", "dplay.flags.ignored", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_FLAG_IGNORED, "Ignored", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_FLAG_IGNORED, NULL, HFILL}},
     { &hf_dplay_flags_can_join,
         { "can join", "dplay.flags.can_join", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_FLAG_CAN_JOIN, "Can Join", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_FLAG_CAN_JOIN, NULL, HFILL}},
     { &hf_dplay_flags_use_ping,
         { "use ping", "dplay.flags.use_ping", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_FLAG_USE_PING, "Use Ping", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_FLAG_USE_PING, NULL, HFILL}},
     { &hf_dplay_flags_no_player_updates,
         { "no player updates", "dplay.flags.no_player_updates", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_P_UPD, "No Player Updates", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_P_UPD, NULL, HFILL}},
     { &hf_dplay_flags_use_auth,
         { "use authentication", "dplay.flags.use_auth", FT_BOOLEAN, 32,
         TFS(&tfs_dplay_flag), DPLAY_FLAG_USE_AUTH, "Use Auth", HFILL}},
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 1bdfce4fc3..d94e86da8b 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1965,7 +1965,7 @@ proto_register_dtls(void)
     { & hf_dtls_alert_message,
       { "Alert Message", "dtls.alert_message",
         FT_NONE, BASE_NONE, NULL, 0x0,
-        "Alert message", HFILL }
+        NULL, HFILL }
     },
     { & hf_dtls_alert_message_level,
       { "Level", "dtls.alert_message.level",
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 9f75e5d041..89af65f99f 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -6656,7 +6656,7 @@ void proto_register_gtp(void)
         {&hf_gtp_chrg_ipv4, {"CG address IPv4", "gtp.chrg_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Charging Gateway address IPv4", HFILL}},
         {&hf_gtp_chrg_ipv6, {"CG address IPv6", "gtp.chrg_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Charging Gateway address IPv6", HFILL}},
         {&hf_gtp_ext_flow_label, {"Flow Label Data I", "gtp.ext_flow_label", FT_UINT16, BASE_HEX, NULL, 0, "Flow label data", HFILL}},
-        {&hf_gtp_ext_id, {"Extension identifier", "gtp.ext_id", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0, "Extension Identifier", HFILL}},
+        {&hf_gtp_ext_id, {"Extension identifier", "gtp.ext_id", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0, NULL, HFILL}},
         {&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
         {&hf_gtp_flags, {"Flags", "gtp.flags", FT_UINT8, BASE_HEX, NULL, 0, "Ver/PT/Spare...", HFILL}},
         {&hf_gtp_flags_ver,
@@ -6672,7 +6672,7 @@ void proto_register_gtp(void)
         {&hf_gtp_flags_pt,
          {"Protocol type", "gtp.flags.payload",
           FT_UINT8, BASE_DEC, VALS(pt_types), GTP_PT_MASK,
-          "Protocol Type", HFILL}
+          NULL, HFILL}
         },
         {&hf_gtp_flags_spare1,
          {"Reserved", "gtp.flags.reserved",
@@ -6735,14 +6735,14 @@ void proto_register_gtp(void)
         {&hf_gtp_qos_mean,
          {"QoS mean", "gtp.qos_mean", FT_UINT8, BASE_DEC, VALS(qos_mean_type), GTP_EXT_QOS_MEAN_MASK, "Quality of Service Mean Throughput", HFILL}},
         {&hf_gtp_qos_al_ret_priority,
-         {"Allocation/Retention priority", "gtp.qos_al_ret_priority", FT_UINT8, BASE_DEC, NULL, 0, "Allocation/Retention Priority", HFILL}},
+         {"Allocation/Retention priority", "gtp.qos_al_ret_priority", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
         {&hf_gtp_qos_traf_class,
-         {"Traffic class", "gtp.qos_traf_class", FT_UINT8, BASE_DEC, VALS(qos_traf_class), GTP_EXT_QOS_TRAF_CLASS_MASK, "Traffic Class", HFILL}},
+         {"Traffic class", "gtp.qos_traf_class", FT_UINT8, BASE_DEC, VALS(qos_traf_class), GTP_EXT_QOS_TRAF_CLASS_MASK, NULL, HFILL}},
         {&hf_gtp_qos_del_order,
-         {"Delivery order", "gtp.qos_del_order", FT_UINT8, BASE_DEC, VALS(qos_del_order), GTP_EXT_QOS_DEL_ORDER_MASK, "Delivery Order", HFILL}},
+         {"Delivery order", "gtp.qos_del_order", FT_UINT8, BASE_DEC, VALS(qos_del_order), GTP_EXT_QOS_DEL_ORDER_MASK, NULL, HFILL}},
         {&hf_gtp_qos_del_err_sdu,
          {"Delivery of erroneous SDU", "gtp.qos_del_err_sdu", FT_UINT8, BASE_DEC, VALS(qos_del_err_sdu), GTP_EXT_QOS_DEL_ERR_SDU_MASK,
-          "Delivery of Erroneous SDU", HFILL}},
+          NULL, HFILL}},
         {&hf_gtp_qos_max_sdu_size,
          {"Maximum SDU size", "gtp.qos_max_sdu_size", FT_UINT8, BASE_DEC, VALS(qos_max_sdu_size), 0, NULL, HFILL}},
         {&hf_gtp_qos_max_ul,
@@ -6752,13 +6752,13 @@ void proto_register_gtp(void)
         {&hf_gtp_qos_res_ber,
          {"Residual BER", "gtp.qos_res_ber", FT_UINT8, BASE_DEC, VALS(qos_res_ber), GTP_EXT_QOS_RES_BER_MASK, "Residual Bit Error Rate", HFILL}},
         {&hf_gtp_qos_sdu_err_ratio,
-         {"SDU Error ratio", "gtp.qos_sdu_err_ratio", FT_UINT8, BASE_DEC, VALS(qos_sdu_err_ratio), GTP_EXT_QOS_SDU_ERR_RATIO_MASK, "SDU Error Ratio",
+         {"SDU Error ratio", "gtp.qos_sdu_err_ratio", FT_UINT8, BASE_DEC, VALS(qos_sdu_err_ratio), GTP_EXT_QOS_SDU_ERR_RATIO_MASK, NULL,
           HFILL}},
         {&hf_gtp_qos_trans_delay,
-         {"Transfer delay", "gtp.qos_trans_delay", FT_UINT8, BASE_DEC, VALS(qos_trans_delay), GTP_EXT_QOS_TRANS_DELAY_MASK, "Transfer Delay", HFILL}},
+         {"Transfer delay", "gtp.qos_trans_delay", FT_UINT8, BASE_DEC, VALS(qos_trans_delay), GTP_EXT_QOS_TRANS_DELAY_MASK, NULL, HFILL}},
         {&hf_gtp_qos_traf_handl_prio,
          {"Traffic handling priority", "gtp.qos_traf_handl_prio", FT_UINT8, BASE_DEC, VALS(qos_traf_handl_prio), GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK,
-          "Traffic Handling Priority", HFILL}},
+          NULL, HFILL}},
         {&hf_gtp_qos_guar_ul,
          {"Guaranteed bit rate for uplink", "gtp.qos_guar_ul", FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0, NULL, HFILL}},
         {&hf_gtp_qos_guar_dl,
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index c559c1f2b9..dd1c3ac1f8 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -1409,7 +1409,7 @@ void proto_register_h223 (void)
 
         { &hf_h223_mux_vc,
           { "H.223 virtual circuit", "h223.mux.vc", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "H.223 Virtual Circuit", HFILL }},
+            NULL, HFILL }},
 
         { &hf_h223_mux_extra,
           { "Extraneous data", "h223.mux.extra", FT_NONE, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index b54c547cff..0bcfa36019 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -12066,7 +12066,7 @@ proto_register_ieee80211 (void)
     {&txbf_tx_ssc,
      {"Transmit Staggered Sounding", "wlan_mgt.txbf.txss",
       FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000004,
-      "Transmit staggered sounding", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_rcv_ndp,
      {"Receive Null Data packet (NDP)", "wlan_mgt.txbf.rxndp",
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 02b3604e7e..9d230807bd 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -2437,7 +2437,7 @@ void proto_register_ieee802154(void)
 
         { &hf_ieee802154_aux_sec_reserved,
         { "Reserved", "wpan.aux_sec.reserved", FT_UINT8, BASE_HEX, NULL, IEEE802154_AUX_KEY_RESERVED_MASK,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_aux_sec_frame_counter,
         { "Frame Counter", "wpan.aux_sec.frame_counter", FT_UINT32, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 6db4d8d1b9..15a57d5d2c 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -4822,7 +4822,7 @@ proto_register_kerberos(void)
                 TFS(&tfs_set_notset), KRB_RM_RESERVED, "Record mark reserved bit", HFILL }},
         { &hf_krb_rm_reclen, {
                 "Record Length", "kerberos.rm.length", FT_UINT32, BASE_DEC,
-                NULL, KRB_RM_RECLEN, "Record length", HFILL }},
+                NULL, KRB_RM_RECLEN, NULL, HFILL }},
         { &hf_krb_transitedtype, {
                 "Type", "kerberos.transited.type", FT_UINT32, BASE_DEC,
                 VALS(krb5_transited_types), 0, "Transited Type", HFILL }},
diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c
index 570b4f8508..be748840be 100644
--- a/epan/dissectors/packet-klm.c
+++ b/epan/dissectors/packet-klm.c
@@ -241,7 +241,7 @@ proto_register_klm(void)
 
 		{ &hf_klm_block, {
 			"block", "klm.block", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_block), 0x0, "Block", HFILL }},
+			TFS(&tfs_block), 0x0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index c3b0188e13..799bb7fa8c 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -252,13 +252,13 @@ static const char *calltype_short_str[NUM_CONTROL_CALL_TYPES+1] = {
   "SRRQ    ",
   "SRRP    ",
   "ACK     ", /* 20 */
-  "FSQ     ", 
-  "FSR     ", 
-  "MSRQ    ", 
-  "MSRP    ", 
+  "FSQ     ",
+  "FSR     ",
+  "MSRQ    ",
+  "MSRP    ",
   "MSE     ", /* 25 */
-  "MSI     ", 
-  "MSEN    ", 
+  "MSI     ",
+  "MSEN    ",
 
 };
 
@@ -574,8 +574,8 @@ static const value_string pw_types_vals[] = {
 static dissector_handle_t ppp_hdlc_handle;
 static dissector_handle_t ppp_lcp_options_handle;
 
-static dissector_handle_t eth_withoutfcs_handle; 
-static dissector_handle_t chdlc_handle; 
+static dissector_handle_t eth_withoutfcs_handle;
+static dissector_handle_t chdlc_handle;
 static dissector_handle_t fr_handle;
 static dissector_handle_t ip_handle;
 static dissector_handle_t mpls_handle;
@@ -609,7 +609,7 @@ static void process_control_avps(tvbuff_t *tvb,
 	guint16 	error_code;
 	guint32 	bits;
 	guint16 	firmware_rev;
-	
+
 		while (idx < length) {    /* Process AVP's */
 			ver_len_hidden	= tvb_get_ntohs(tvb, idx);
 			avp_len		= AVP_LENGTH(ver_len_hidden);
@@ -637,7 +637,7 @@ static void process_control_avps(tvbuff_t *tvb,
 							  val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"),
 							  avp_type);
 			}
-										
+
 
 			l2tp_avp_tree = proto_item_add_subtree(tf,  ett_l2tp_avp);
 
@@ -670,7 +670,7 @@ static void process_control_avps(tvbuff_t *tvb,
 									tvb, idx, 4, FALSE);
 
 				avp_vendor_id  = tvb_get_ntohl(tvb, idx);
-				
+
 				idx += 4;
 				avp_len -= 4;
 				continue;
@@ -713,7 +713,7 @@ static void process_control_avps(tvbuff_t *tvb,
 						avp_len -= 2;
 					}
 					break;
-					
+
 				case CISCO_LOCAL_SESSION_ID:
 					proto_tree_add_text(l2tp_avp_tree, tvb, idx, 4,
 							    "Local Session ID: %u",
@@ -774,7 +774,7 @@ static void process_control_avps(tvbuff_t *tvb,
 							    "Interface MTU: %u",
 							    tvb_get_ntohs(tvb, idx));
 					break;
-					
+
 				default:
 					proto_tree_add_text(l2tp_avp_tree, tvb, idx,
 							    avp_len, "Vendor-Specific AVP");
@@ -837,7 +837,7 @@ static void process_control_avps(tvbuff_t *tvb,
 					break;
 				error_code = tvb_get_ntohs(tvb, idx);
 				proto_tree_add_text(l2tp_avp_tree, tvb, idx, 2,
-						    "Error code: %u - %s", error_code, 
+						    "Error code: %u - %s", error_code,
 						    val_to_str(error_code, error_code_vals, "Unknown (%u)"));
 				idx += 2;
 				avp_len -= 2;
@@ -1311,7 +1311,7 @@ static void process_control_avps(tvbuff_t *tvb,
 				guint32 l_int, h_int;
 				if (avp_len < 8)
 					break;
-				
+
 				h_int = tvb_get_ntohl(tvb, idx);
 				l_int = tvb_get_ntohl(tvb, idx+4);
 				if (!h_int && !l_int) {
@@ -1330,7 +1330,7 @@ static void process_control_avps(tvbuff_t *tvb,
 				guint32 l_int, h_int;
 				if (avp_len < 8)
 					break;
-				
+
 				h_int = tvb_get_ntohl(tvb, idx);
 				l_int = tvb_get_ntohl(tvb, idx+4);
 				if (!h_int && !l_int) {
@@ -1370,7 +1370,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	proto_tree	*l2_specific = NULL;
 	proto_item	*ti = NULL;
 	tvbuff_t	*next_tvb;
-	
+
 	/* Get Session ID */
 	sid = tvb_get_ntohl(tvb, idx);
 	idx += 4;
@@ -1410,16 +1410,16 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 						tvb, idx + l2tpv3_cookie, 4, FALSE);
 			l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec);
 
-			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_v, tvb, 
+			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_v, tvb,
 						idx + l2tpv3_cookie,1, FALSE);
-		
-			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, 
+
+			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb,
 						idx + l2tpv3_cookie,1, FALSE);
-		
-			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_flow_id, tvb, 
+
+			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_flow_id, tvb,
 						idx + l2tpv3_cookie,1, FALSE);
-		
-			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, 
+
+			proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb,
 						idx + l2tpv3_cookie + 2,2, FALSE);
 		}
 		next_tvb = tvb_new_subset_remaining(tvb, idx + l2tpv3_cookie + 4);
@@ -1513,11 +1513,11 @@ process_l2tpv3_data_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_tree *l2tp_tree = NULL, *ctrl_tree;
 	proto_item *l2tp_item = NULL, *ti;
-	
+
 	int idx = 0;
 	int control;
 	int sid;
-	
+
 	control = tvb_get_ntohs(tvb, idx);
 	idx += 2; 			/* skip ahead */
 	idx += 2;			/* Skip the reserved */
@@ -1554,12 +1554,12 @@ process_l2tpv3_data_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_tree *l2tp_tree = NULL;
 	proto_item *l2tp_item = NULL, *ti;
-	
+
 	int idx = 0;
 	int sid;
 
 	sid = tvb_get_ntohl(tvb, idx);
-	
+
 	if (tree) {
 		l2tp_item = proto_tree_add_item(tree, proto_l2tp, tvb, 0, -1, FALSE);
 		l2tp_tree = proto_item_add_subtree(l2tp_item, ett_l2tp);
@@ -1583,7 +1583,7 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 {
 	proto_tree *l2tp_tree=NULL, *ctrl_tree;
 	proto_item *l2tp_item = NULL, *ti;
-	
+
 	int idx = baseIdx;
 	int tmp_idx;
 	guint16 length = 0;		/* Length field */
@@ -1591,7 +1591,7 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 	guint16 avp_type;
 	guint16 msg_type;
 	guint16	control = 0;
-	
+
 	control = tvb_get_ntohs(tvb, idx);
 	idx += 2; 			/* skip ahead */
 	if (LENGTH_BIT(control)) { 	/* length field included ? */
@@ -1620,7 +1620,7 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 
 			avp_type = tvb_get_ntohs(tvb, tmp_idx);
 			tmp_idx += 2;
-				
+
 			if (avp_type == CONTROL_MESSAGE) {
 				/* We print message type */
 				msg_type = tvb_get_ntohs(tvb, tmp_idx);
@@ -1697,7 +1697,7 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 		}
 		idx += 2;
 	}
-	
+
 	if (tree && (LENGTH_BIT(control))&&(length==12)) {
 		proto_tree_add_text(l2tp_tree, tvb, 0, 0, "Zero Length Bit message");
 	}
@@ -1900,7 +1900,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			idx += offset_size;
 		}
 	}
-	
+
 	if (tree && (LENGTH_BIT(control))&&(length==12)) {
 		proto_tree_add_text(l2tp_tree, tvb, 0, 0, "Zero Length Bit message");
 	}
@@ -1950,8 +1950,8 @@ dissect_l2tp_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		/* Call to process l2tp v3 data message */
 		process_l2tpv3_data_ip(tvb, pinfo, tree);
 	}
-	
-	return;	
+
+	return;
 }
 
 /* registration with the filtering engine */
@@ -1965,11 +1965,11 @@ proto_register_l2tp(void)
 
 		{ &hf_l2tp_length_bit,
 		{ "Length Bit", "l2tp.length_bit", FT_BOOLEAN, 16, TFS(&l2tp_length_bit_truth), 0x4000,
-			"Length bit", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_seq_bit,
 		{ "Sequence Bit", "l2tp.seq_bit", FT_BOOLEAN, 16, TFS(&l2tp_seq_bit_truth), 0x0800,
-			"Sequence bit", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_offset_bit,
 		{ "Offset bit", "l2tp.offset_bit", FT_BOOLEAN, 16, TFS(&l2tp_offset_bit_truth), 0x0200,
@@ -2071,7 +2071,7 @@ proto_register_l2tp(void)
 		{ "T-bit","lt2p.l2_spec_t", FT_BOOLEAN, 8, NULL, 0x08,
 			"Transport Type Bit", HFILL }},
 
-		{ &hf_l2tp_l2_spec_g, 
+		{ &hf_l2tp_l2_spec_g,
 		{ "G-bit","lt2p.l2_spec_g", FT_BOOLEAN, 8, NULL, 0x04,
 			"EFCI Bit", HFILL }},
 
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 00a4b5c898..f5fadfb55f 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -902,7 +902,7 @@ proto_register_mount(void)
 			VALS(mount3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_sgi_mount_procedure_v1, {
 			"SGI V1 procedure", "mount.procedure_sgi_v1", FT_UINT32, BASE_DEC,
-			VALS(sgi_mount1_proc_vals), 0, "SGI V1 Procedure", HFILL }},
+			VALS(sgi_mount1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_mount_path, {
 			"Path", "mount.path", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 8eb6dceae0..e17c73e420 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -3929,11 +3929,11 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_tape_flags_error, {
 		"Error", "ndmp.tape.flags.error", FT_BOOLEAN, 32,
-		TFS(&tfs_ndmp_tape_flags_error), 0x00000020, "error", HFILL, }},
+		TFS(&tfs_ndmp_tape_flags_error), 0x00000020, NULL, HFILL, }},
 
 	{ &hf_ndmp_tape_flags_unload, {
 		"Unload", "ndmp.tape.flags.unload", FT_BOOLEAN, 32,
-		TFS(&tfs_ndmp_tape_flags_unload), 0x00000040, "unload", HFILL, }},
+		TFS(&tfs_ndmp_tape_flags_unload), 0x00000040, NULL, HFILL, }},
 
 	{ &hf_ndmp_tape_file_num, {
 		"file_num", "ndmp.tape.status.file_num", FT_UINT32, BASE_DEC,
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index a98dc84532..9fc39b13d1 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -2436,7 +2436,7 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_feedback_feedback2,
             { "FEEDBACK-2",
               "pdcp-lte.rohc.feedback.feedback2", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Feedback-2", HFILL
+              NULL, HFILL
             }
         },
 
diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c
index ff97456d31..c5209a8122 100644
--- a/epan/dissectors/packet-pnrp.c
+++ b/epan/dissectors/packet-pnrp.c
@@ -1325,7 +1325,7 @@ void proto_register_pnrp(void)
 			{ "Solicit Type", "pnrp.segment.solicitType", FT_UINT8, BASE_DEC, VALS(solicitType), 0x0,
 				NULL, HFILL }},
 		{ &hf_pnrp_message_ipv6,
-			{ "IPv6 Address","pnrp.segment.ipv6Address",FT_IPv6, BASE_NONE, NULL, 0x0,"IPv6 Address",HFILL}}
+			{ "IPv6 Address","pnrp.segment.ipv6Address",FT_IPv6, BASE_NONE, NULL, 0x0,NULL,HFILL}}
 	};
 
 	/* Protocol subtree array */
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 0d39dd0ff1..2a1183d38f 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -2856,11 +2856,11 @@ proto_register_sflow(void) {
         { &hf_sflow_245_pri_in,
             { "Incoming 802.1p priority", "sflow_245.pri.in",
                 FT_UINT32, BASE_DEC, NULL, 0x0,
-                "Incoming 802.1p priority", HFILL}},
+                NULL, HFILL}},
         { &hf_sflow_245_pri_out,
             { "Outgoing 802.1p priority", "sflow_245.pri.out",
                 FT_UINT32, BASE_DEC, NULL, 0x0,
-                "Outgoing 802.1p priority", HFILL}},
+                NULL, HFILL}},
         { &hf_sflow_245_nexthop_v4,
             { "Next hop", "sflow_245.nexthop",
                 FT_IPv4, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index f13e48b940..7f9df82a3c 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -4002,7 +4002,7 @@ void proto_register_sip(void)
 		{ &hf_header_array[POS_P_SERVED_USER],
 		       { "P-Served-User",  	"sip.P-Served-User",
 		       FT_STRING, BASE_NONE,NULL,0x0,
-			"P-Served-User", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[POS_P_USER_DATABASE],
 		       { "P-User-Database",  	"sip.P-User-Database",
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index e0e8e57ad1..442d9d258c 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -17815,7 +17815,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_server_cap_reserved,
 		{ "Reserved", "smb.server_cap.reserved", FT_BOOLEAN, 32,
-		TFS(&tfs_server_cap_reserved), SERVER_CAP_RESERVED, "RESERVED", HFILL }},
+		TFS(&tfs_server_cap_reserved), SERVER_CAP_RESERVED, NULL, HFILL }},
 
 	{ &hf_smb_server_cap_bulk_transfer,
 		{ "Bulk Transfer", "smb.server_cap.bulk_transfer", FT_BOOLEAN, 32,
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index 996ff6b542..419026310a 100644
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -5333,9 +5333,9 @@ proto_register_tn3270(void)
 
     /* 5.9 - Erase/Reset */
     { &hf_tn3270_erase_flags,
-        {  "tn3270.erase_flags", "tn3270.erase_flags",
+        {  "Erase Flags", "tn3270.erase_flags",
             FT_UINT8, BASE_HEX, NULL, 0x0,
-            "tn3270.erase_flags", HFILL }},
+            NULL, HFILL }},
     /* End - 5.9 - Erase/Reset */
 
     /* 5.10 - Load Color Table */
@@ -6083,7 +6083,7 @@ proto_register_tn3270(void)
     { &hf_tn3270_asia_sdp_sosi_soset,
         {  "Set ID of the Shift Out (SO) character set", "tn3270.asia_sdp_sosi_soset",
             FT_UINT8, BASE_HEX, NULL, 0x0,
-            "Set ID of the Shift Out (SO) character set", HFILL }},
+            NULL, HFILL }},
     { &hf_tn3270_asia_sdp_ic_func,
         { "SO/SI Creation supported",
             "tn3270.asia_sdp_ic_func", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
@@ -6502,7 +6502,7 @@ proto_register_tn3270(void)
     { &hf_tn3270_ua_buffsz,
         {  "Character buffer size (bytes)", "tn3270.ua_buffsz",
             FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Character buffer size (bytes)", HFILL }},
+            NULL, HFILL }},
     { &hf_tn3270_ua_xmin,
         {  "Minimum number of X units in variable cell", "tn3270.ua_xmin",
             FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index 497441bb66..372eedf541 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -3338,7 +3338,7 @@ proto_register_wlccp(void)
 		{ &hf_wlccp_ipv4_address,
 		  { "IPv4 Address", "wlccp.ipv4_address",
 		    FT_IPv4, BASE_NONE, NULL, 0,
-		    "IPv4 address", HFILL }
+		    NULL, HFILL }
 		},
 
 		{ &hf_wlccp_scm_hop_address,
@@ -3864,13 +3864,13 @@ proto_register_wlccp(void)
 		{ &hf_80211_cap_cf_pollable,
 		  { "CF Pollable flag", "wlccp.80211_cf_pollable_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_CFPOLL, "CF Pollable Flag", HFILL }
+		    F_80211_CFPOLL, NULL, HFILL }
 		},
 
 		{ &hf_80211_cap_cf_poll_req,
 		  { "CF Poll Request flag", "wlccp.80211_cf_poll_req_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_CFPOLL_REQ, "CF Poll Request Flag", HFILL }
+		    F_80211_CFPOLL_REQ, NULL, HFILL }
 		},
 
 		{ &hf_80211_cap_privacy,
@@ -3882,43 +3882,43 @@ proto_register_wlccp(void)
 		{ &hf_80211_short_preamble,
 		  { "Short Preamble flag", "wlccp.80211_short_preamble_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_SHORT_PREAMBLE, "Short Preamble Flag", HFILL }
+		    F_80211_SHORT_PREAMBLE, NULL, HFILL }
 		},
 
 		{ &hf_80211_pbcc,
 		  { "PBCC flag", "wlccp.80211_pbcc_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_PBCC, "PBCC Flag", HFILL }
+		    F_80211_PBCC, NULL, HFILL }
 		},
 
 		{ &hf_80211_chan_agility,
 		  { "Channel Agility flag", "wlccp.80211_chan_agility_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_CH_AGILITY, "Channel Agility Flag", HFILL }
+		    F_80211_CH_AGILITY, NULL, HFILL }
 		},
 
 		{ &hf_80211_spectrum_mgmt,
 		  { "Spectrum Management flag", "wlccp.80211_spectrum_mgmt_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_SPEC_MGMT, "Spectrum Management Flag", HFILL }
+		    F_80211_SPEC_MGMT, NULL, HFILL }
 		},
 
 		{ &hf_80211_qos,
 		  { "QOS flag", "wlccp.80211_qos_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_QOS, "QOS Flag", HFILL }
+		    F_80211_QOS, NULL, HFILL }
 		},
 
 		{ &hf_80211_short_time_slot,
 		  { "Short Time Slot flag", "wlccp.80211_short_time_slot_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_SHORT_TIME_SLOT, "Short Time Slot Flag", HFILL }
+		    F_80211_SHORT_TIME_SLOT, NULL, HFILL }
 		},
 
 		{ &hf_80211_apsd,
 		  { "APSD flag", "wlccp.80211_apsd_flag",
 		    FT_UINT16, BASE_DEC, NULL,
-		    F_80211_APSD, "APSD Flag", HFILL }
+		    F_80211_APSD, NULL, HFILL }
 		},
 
 		{ &hf_80211_reserved,
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index ae923619aa..3aaf8181a9 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -884,7 +884,7 @@ proto_register_wtp(void)
 	    { 	"U/P flag",
 		"wtp.header.UP",
 		FT_BOOLEAN, 8, TFS( &UP_truth ), 0x10,
-		"U/P Flag", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Inv_Reserved,
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index 3c74451860..07bfd4dd31 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -1688,7 +1688,7 @@
 { &hf_x11_glx_render_DepthBoundsEXT_zmax, { "zmax", "x11.glx.render.DepthBoundsEXT.zmax", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_BlendEquationSeparateEXT_modeRGB, { "modeRGB", "x11.glx.render.BlendEquationSeparateEXT.modeRGB", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
 { &hf_x11_glx_render_BlendEquationSeparateEXT_modeA, { "modeA", "x11.glx.render.BlendEquationSeparateEXT.modeA", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_op_name, { "render op", "x11.glx.render.op", FT_UINT16, BASE_DEC, VALS(glx_render_op_name), 0, "render op", HFILL }},
+{ &hf_x11_glx_render_op_name, { "render op", "x11.glx.render.op", FT_UINT16, BASE_DEC, VALS(glx_render_op_name), 0, NULL, HFILL }},
 
 { &hf_x11_bigreq_Enable_reply_maximum_request_length, { "maximum_request_length", "x11.bigreq.Enable.reply.maximum_request_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_bigreq_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(bigreq_extension_minor), 0, "minor opcode", HFILL }},