Fix some field mask widths.

11 files changed, 32 insertions, 32 deletions

diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index 95a19b5254..beba56d105 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -3431,7 +3431,7 @@ proto_register_capwap_control(void)
         },
         { &hf_capwap_header_flags_t,
             { "Payload Type", "capwap.header.flags.t",
-              FT_BOOLEAN, 24, TFS(&flag_type_t), 0x0000100,
+              FT_BOOLEAN, 24, TFS(&flag_type_t), 0x000100,
               NULL, HFILL }
         },
         { &hf_capwap_header_flags_f,
@@ -4942,22 +4942,22 @@ proto_register_capwap_control(void)
         },
         { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_n,
             { "Radio Type 802.11n", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_n",
-              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x0008,
+              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x8,
               NULL, HFILL }
         },
         { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_g,
             { "Radio Type 802.11g", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_g",
-              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x0004,
+              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x4,
               NULL, HFILL }
         },
         { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_a,
             { "Radio Type 802.11a", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_a",
-              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x0002,
+              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x2,
               NULL, HFILL }
         },
         { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_b,
             { "Radio Type 802.11b", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_b",
-              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x0001,
+              FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x1,
               NULL, HFILL }
         },
 
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index 1363e2bf76..9c83c4aa18 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -9741,12 +9741,12 @@ void proto_register_dis(void)
             },
             { &hf_dis_environment_status_last,
               { "Environment Status Last", "dis.environmental.environment_status_last",
-                FT_UINT8, BASE_DEC, VALS(environmental_environment_status_last_vals), 0x00000001,
+                FT_UINT8, BASE_DEC, VALS(environmental_environment_status_last_vals), 0x01,
                 NULL, HFILL }
             },
             { &hf_dis_environment_status_on,
               { "Environment Status Last", "dis.environmental.environment_status_last",
-                FT_UINT8, BASE_DEC, VALS(environmental_environment_status_on_vals), 0x00000002,
+                FT_UINT8, BASE_DEC, VALS(environmental_environment_status_on_vals), 0x02,
                 NULL, HFILL }
             },
             { &hf_dis_aggregate_formation,
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index ce3916fb0d..099d7c0bb4 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -11425,42 +11425,42 @@ void proto_register_gtpv2(void)
       },
       { &hf_gtpv2_rohc_profiles_bit0,
       { "Profile Identifier: 0x0002, UDP/IP", "gtpv2.rohc_profiles.b0",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0001,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x01,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit1,
       { "Profile Identifier: 0x0003, ESP/IP", "gtpv2.rohc_profiles.b1",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0002,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x02,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit2,
       { "Profile Identifier: 0x0004, IP", "gtpv2.rohc_profiles.b2",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0004,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x04,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit3,
       { "Profile Identifier: 0x0006, TCP/IP", "gtpv2.rohc_profiles.b3",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0008,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x08,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit4,
       { "Profile Identifier: 0x0102, UDP/IP", "gtpv2.rohc_profiles.b4",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0010,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x10,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit5,
       { "Profile Identifier: 0x0103, ESP/IP", "gtpv2.rohc_profiles.b5",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0020,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x20,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit6,
       { "Profile Identifier: 0x0104, IP", "gtpv2.rohc_profiles.b6",
-          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x0040,
+          FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x40,
           NULL, HFILL }
       },
       { &hf_gtpv2_rohc_profiles_bit7,
       { "Spare", "gtpv2.rohc_profiles.b7",
-          FT_BOOLEAN, 8, NULL, 0x0080,
+          FT_BOOLEAN, 8, NULL, 0x80,
           NULL, HFILL }
       },
       { &hf_gtpv2_max_cid,
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index a88dffe8e7..1287e21cc9 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -2087,7 +2087,7 @@ void proto_register_icmp(void)
 
 		{&hf_icmp_mpls_label,
 		 {"Label", "icmp.mpls.label", FT_UINT24, BASE_DEC, NULL,
-		  0x00fffff0,
+		  0xfffff0,
 		  NULL, HFILL}},
 
 		{&hf_icmp_mpls_exp,
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 4506314961..488fbea59e 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -41520,20 +41520,20 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_tclas_class_mask9_frame_control_match_spec,
      {"Frame Control Spec", "wlan.tclas.class9.frame_control_spec",
-      FT_UINT16, BASE_HEX, VALS(frame_control_mask_vals), 0x000003, NULL, HFILL }},
+      FT_UINT16, BASE_HEX, VALS(frame_control_mask_vals), 0x0003, NULL, HFILL }},
 
     {&hf_ieee80211_tclas_class_mask9_address_1_match_spec,
      {"Address 1 Spec", "wlan.tclas.class9.mask.address_1_spec",
-      FT_UINT16, BASE_HEX, VALS(address_1_mask_vals), 0x000003, NULL, HFILL }},
+      FT_UINT16, BASE_HEX, VALS(address_1_mask_vals), 0x0003, NULL, HFILL }},
 
     {&hf_ieee80211_tclas_class_mask9_address_2_match_spec,
      {"Address 2 Spec", "wlan.tclas.class9.mask.address_2_spec",
       FT_UINT16, BASE_HEX, VALS(address_2_mask_vals), 0x00000C, NULL, HFILL }},
 
     {&hf_ieee80211_tclas_class_mask9_sequence_control_spec,
-     {"Sequence Control Spec", "wlan.tclas.class9.mask.sequence_contro_spec",
+     {"Sequence Control Spec", "wlan.tclas.class9.mask.sequence_control_spec",
       FT_UINT16, BASE_HEX, VALS(sequence_control_mask_vals),
-      0x000030, NULL, HFILL }},
+      0x0030, NULL, HFILL }},
 
     {&hf_ieee80211_tclas_class_mask9_reserved,
      {"Reserved", "wlan.tclas.class9.mask.reserved",
@@ -47173,15 +47173,15 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_he_uph_ul_power_headroom,
      {"UL Power Headroom", "wlan.htc.he.a_control.uph.ul_power_headroom",
-      FT_UINT8, BASE_DEC, NULL, 0x0000001f, NULL, HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }},
 
     {&hf_ieee80211_he_uph_ul_min_transmit_power_flag,
      {"Minimum Transmit Power Flag", "wlan.htc.he.a_control.uph.min_transmit_power_flag",
-      FT_BOOLEAN, 8, NULL, 0x00000020, NULL, HFILL }},
+      FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 
     {&hf_ieee80211_he_uph_reserved,
      {"Reserved", "wlan.htc.he.a_control.uph.reserved",
-      FT_UINT8, BASE_HEX, NULL, 0x000000c0, NULL, HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xc0, NULL, HFILL }},
 
     {&hf_ieee80211_he_btc_avail_chan,
      {"Available Channel Bitmap", "wlan.htc.he.a_control.bqr.avail_chan_bitmap",
diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c
index 934aa56173..d4dbcd26c9 100644
--- a/epan/dissectors/packet-mplstp-oam.c
+++ b/epan/dissectors/packet-mplstp-oam.c
@@ -303,12 +303,12 @@ proto_register_mplstp_fm(void)
 
     { &hf_mplstp_fm_flags_l,
       { "Link Down Indication", "mplstp_oam.flag_l",
-        FT_BOOLEAN, 8, NULL, 0x0002, NULL, HFILL}
+        FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}
     },
 
     { &hf_mplstp_fm_flags_r,
       { "FM Condition Cleared", "mplstp_oam.flag_r",
-        FT_BOOLEAN, 8, NULL, 0x0001, "Fault Condition Cleared", HFILL}
+        FT_BOOLEAN, 8, NULL, 0x01, "Fault Condition Cleared", HFILL}
     },
   };
 
diff --git a/epan/dissectors/packet-opa-mad.c b/epan/dissectors/packet-opa-mad.c
index bb4c4b6b53..8165213b82 100644
--- a/epan/dissectors/packet-opa-mad.c
+++ b/epan/dissectors/packet-opa-mad.c
@@ -9117,7 +9117,7 @@ void proto_register_opa_mad(void)
         },
         { &hf_opa_Trap_DataValid_Gid2, {
                 "Gid2", "opa.trap.datavalid.gid2",
-                FT_BOOLEAN, 16, TFS(&tfs_valid_invalid), 0x01000, NULL, HFILL }
+                FT_BOOLEAN, 16, TFS(&tfs_valid_invalid), 0x0100, NULL, HFILL }
         },
         { &hf_opa_Trap_DataValid_Reserved, {
                 "DataValid", "opa.trap.datavalid.reserved",
diff --git a/epan/dissectors/packet-pw-oam.c b/epan/dissectors/packet-pw-oam.c
index 61908df83f..c1215e29a9 100644
--- a/epan/dissectors/packet-pw-oam.c
+++ b/epan/dissectors/packet-pw-oam.c
@@ -150,7 +150,7 @@ proto_register_pw_oam(void)
 
     {&hf_pw_oam_flags_a,
       {"Acknowledgement", "pw_oam.flags_a",
-        FT_BOOLEAN, 8, NULL, 0x0080, "ACK bit", HFILL}
+        FT_BOOLEAN, 8, NULL, 0x80, "ACK bit", HFILL}
     },
 
     {&hf_pw_oam_tlv_reserved,
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index e64d4f6dd1..f3327e841b 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -14257,11 +14257,11 @@ void proto_register_rtps(void) {
     },
     { &hf_rtps_flag_unregistered, {
         "Unregistered", "rtps.flag.unregistered",
-        FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x0002, NULL, HFILL }
+        FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02, NULL, HFILL }
     },
     { &hf_rtps_flag_disposed, {
         "Disposed", "rtps.flag.undisposed",
-        FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x0001, NULL, HFILL }
+        FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01, NULL, HFILL }
     },
     { &hf_rtps_flag_participant_announcer, {
         "Participant Announcer", "rtps.flag.participant_announcer",
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 12b388b366..ae8150a377 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -2168,7 +2168,7 @@ void proto_register_synphasor(void)
 
 		{ &hf_conf_phasor_user_data,
 		{ "Binary format", "synphasor.conf.phasor_user_flags", FT_BOOLEAN, 8,
-		  TFS(&conf_phasor_user_defined), 0x00ff, NULL, HFILL }},
+		  TFS(&conf_phasor_user_defined), 0xff, NULL, HFILL }},
 
 		{ &hf_conf_phasor_scale_factor,
 		{ "Phasor scale factor", "synphasor.conf.phasor_scale_factor", FT_FLOAT,
diff --git a/epan/dissectors/packet-vrt.c b/epan/dissectors/packet-vrt.c
index b96e8f0795..b4548d680a 100644
--- a/epan/dissectors/packet-vrt.c
+++ b/epan/dissectors/packet-vrt.c
@@ -504,7 +504,7 @@ proto_register_vrt(void)
         { &hf_vrt_trailer_ind_user0,
             { "User indicator 0", "vrt.user0",
             FT_BOOLEAN, 16,
-            NULL, 0x00008,
+            NULL, 0x0008,
             NULL, HFILL }
         },
         { &hf_vrt_trailer_ind_user1,
@@ -516,7 +516,7 @@ proto_register_vrt(void)
         { &hf_vrt_trailer_ind_user2,
             { "User indicator 2", "vrt.user2",
             FT_BOOLEAN, 16,
-            NULL, 0x00002,
+            NULL, 0x0002,
             NULL, HFILL }
         },
         { &hf_vrt_trailer_ind_user3,