tools/check_typed_item_calls: check FT_BOOLEAN mask length

1 files changed, 36 insertions, 34 deletions

diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index dcfd298f34..b66c43ce36 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -7527,17 +7527,17 @@ proto_register_dhcp(void)
 
 		{ &hf_dhcp_pkt_mdc_supp_flow_secure,
 		  { "Secure Flow (Full Secure Provisioning Flow)", "dhcp.vendor.pktc.mdc.supp_flow.secure",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x01,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0001,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_pkt_mdc_supp_flow_hybrid,
 		  { "Hybrid Flow", "dhcp.vendor.pktc.mdc.supp_flow.hybrid",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x02,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0002,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_pkt_mdc_supp_flow_basic,
 		  { "Basic Flow", "dhcp.vendor.pktc.mdc.supp_flow.basic",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x04,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0004,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_pkt_mdc_mib_cl_mta,
@@ -7642,149 +7642,151 @@ proto_register_dhcp(void)
 
 		{ &hf_dhcp_docsis_cm_cap_ranging_hold_off_cm,
 		  { "CM", "dhcp.docsis_cm_cap.ranging_hold_off.cm",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x01,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0001,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_ranging_hold_off_eps,
 		  { "ePS or eRouter", "dhcp.docsis_cm_cap.ranging_hold_off.eps",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x02,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0002,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_ranging_hold_off_emta,
 		  { "EMTA or EDVA", "dhcp.docsis_cm_cap.ranging_hold_off.emta",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x04,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0004,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_ranging_hold_off_dsg,
 		  { "DSG/eSTB", "dhcp.docsis_cm_cap.ranging_hold_off.dsg",
-		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x08,
+		    FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0008,
 		    NULL, HFILL }},
 
+
 		{ &hf_dhcp_docsis_cm_cap_mpls_stpid,
 		  { "[IEEE 802.1ad] S-TPID", "dhcp.docsis_cm_cap.mpls.stpid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x01,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000001,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_svid,
 		  { "[IEEE 802.1ad] S-VID", "dhcp.docsis_cm_cap.mpls.svid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x02,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000002,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_spcp,
 		  { "[IEEE 802.1ad] S-PCP", "dhcp.docsis_cm_cap.mpls.spcp",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x04,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000004,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_sdei,
 		  { "[IEEE 802.1ad] S-DEI", "dhcp.docsis_cm_cap.mpls.sdei",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x08,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000008,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_ctpid,
 		  { "[IEEE 802.1ad] C-TPID", "dhcp.docsis_cm_cap.mpls.ctpid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x10,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000010,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_cvid,
 		  { "[IEEE 802.1ad] C-VID", "dhcp.docsis_cm_cap.mpls.cvid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x20,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000020,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_cpcp,
 		  { "[IEEE 802.1ad] C-PCP", "dhcp.docsis_cm_cap.mpls.cpcp",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x40,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000040,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_ccfi,
 		  { "[IEEE 802.1ad] C-CFI", "dhcp.docsis_cm_cap.mpls.ccfi",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x80,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000080,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_stci,
 		  { "[IEEE 802.1ad] S-TCI", "dhcp.docsis_cm_cap.mpls.stci",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x100,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000100,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_ctci,
 		  { "[IEEE 802.1ad] C-TCI", "dhcp.docsis_cm_cap.mpls.ctci",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x200,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000200,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_itpid,
 		  { "[IEEE 802.1ad] I-TPID", "dhcp.docsis_cm_cap.mpls.itpid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x400,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000400,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_isid,
 		  { "[IEEE 802.1ad] I-SID", "dhcp.docsis_cm_cap.mpls.isid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x800,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000800,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_itci,
 		  { "[IEEE 802.1ad] I-TCI", "dhcp.docsis_cm_cap.mpls.itci",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x1000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00001000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_ipcp,
 		  { "[IEEE 802.1ad] I-PCP", "dhcp.docsis_cm_cap.mpls.ipcp",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x2000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00002000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_idei,
 		  { "[IEEE 802.1ad] I-DEI", "dhcp.docsis_cm_cap.mpls.idei",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x4000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00004000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_iuca,
 		  { "[IEEE 802.1ad] I-UCA", "dhcp.docsis_cm_cap.mpls.iuca",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x8000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00008000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_btpid,
 		  { "[IEEE 802.1ad] B-TPID", "dhcp.docsis_cm_cap.mpls.btpid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x10000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00010000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_btci,
 		  { "[IEEE 802.1ad] B-TCI", "dhcp.docsis_cm_cap.mpls.btci",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x20000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00020000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_bpcp,
 		  { "[IEEE 802.1ad] B-PCP", "dhcp.docsis_cm_cap.mpls.bpcp",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x40000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00040000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_bdei,
 		  { "[IEEE 802.1ad] B-DEI", "dhcp.docsis_cm_cap.mpls.bdei",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x80000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00080000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_bvid,
 		  { "[IEEE 802.1ad] B-VID", "dhcp.docsis_cm_cap.mpls.bvid",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x100000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00100000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_bda,
 		  { "[IEEE 802.1ad] B-DA", "dhcp.docsis_cm_cap.mpls.bda",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x200000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00200000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_bsa,
 		  { "[IEEE 802.1ad] B-SA", "dhcp.docsis_cm_cap.mpls.bsa",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x200000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00400000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_tc,
 		  { "MPLS TC", "dhcp.docsis_cm_cap.mpls.tc",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x200000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00800000,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_docsis_cm_cap_mpls_label,
 		  { "MPLS Label", "dhcp.docsis_cm_cap.mpls.label",
-		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x200000,
+		    FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x01000000,
 		    NULL, HFILL }},
 
+
 		{ &hf_dhcp_docsis_cm_cap_ussymrate_160,
 		  { "160 ksps symbol rate", "dhcp.docsis_cm_cap.ussymrate.160",
 		    FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
@@ -9939,12 +9941,12 @@ proto_register_dhcp(void)
 
 		{ &hf_dhcp_ccc_ietf_sec_tkt_pc_provision_server,
 		  { "Invalidate PacketCable Provisioning Server", "dhcp.ccc.ietf.sec_tkt.pc_provision_server",
-		    FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x01,
+		    FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0001,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_ccc_ietf_sec_tkt_all_pc_call_management,
 		  { "Invalidate All PacketCable Call Management Servers", "dhcp.ccc.ietf.sec_tkt.all_pc_call_management",
-		    FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x02,
+		    FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0002,
 		    NULL, HFILL }},
 
 		{ &hf_dhcp_option242_avaya,