Comment out unused hf[] entries and related found by checkhf.

svn path=/trunk/; revision=54989

5 files changed, 54 insertions, 20 deletions

diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c
index 74705bfc4f..debe9d649f 100644
--- a/epan/dissectors/packet-exported_pdu.c
+++ b/epan/dissectors/packet-exported_pdu.c
@@ -52,7 +52,7 @@ static int hf_exported_pdu_ipv6_dst = -1;
 static int hf_exported_pdu_port_type = -1;
 static int hf_exported_pdu_src_port = -1;
 static int hf_exported_pdu_dst_port = -1;
-static int hf_exported_pdu_sctp_ppid = -1;
+/** static int hf_exported_pdu_sctp_ppid = -1; **/
 static int hf_exported_pdu_ss7_opc = -1;
 static int hf_exported_pdu_ss7_dpc = -1;
 static int hf_exported_pdu_orig_fno = -1;
@@ -284,11 +284,13 @@ proto_register_exported_pdu(void)
                FT_UINT32, BASE_DEC, NULL, 0,
               NULL, HFILL }
         },
+#if 0
         { &hf_exported_pdu_sctp_ppid,
             { "SCTP PPID", "exported_pdu.sctp_ppid",
                FT_UINT32, BASE_DEC, NULL, 0,
               NULL, HFILL }
         },
+#endif
         { &hf_exported_pdu_ss7_opc,
             { "SS7 OPC", "exported_pdu.ss7_opc",
                FT_UINT32, BASE_DEC, NULL, 0,
diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c
index 62bfab7bd3..a4957fbe66 100644
--- a/epan/dissectors/packet-ieee17221.c
+++ b/epan/dissectors/packet-ieee17221.c
@@ -282,7 +282,7 @@ void proto_reg_handoff_17221(void);
 #define AECP_OFFSET_STREAM_INFO_STREAM_DEST_MAC          52
 #define AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_CODE        58
 #define AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_BRIDGE_ID   60
-#define AECP_OFFSET_STREAM_INFO_STREAM_VLAN_ID           68
+/** #define AECP_OFFSET_STREAM_INFO_STREAM_VLAN_ID           68 **/
 
 /* GET/SET_NAME */
 #define AECP_OFFSET_NAME_DESCRIPTOR_TYPE             24
@@ -1896,10 +1896,10 @@ static int hf_adp_listener_cap = -1;
 static int hf_adp_controller_cap = -1;
 static int hf_adp_avail_index = -1;
 static int hf_adp_gptp_gm_id = -1;
-static int hf_adp_def_aud_format = -1;
-static int hf_adp_def_vid_format = -1;
+/* static int hf_adp_def_aud_format = -1; */
+/* static int hf_adp_def_vid_format = -1; */
 static int hf_adp_assoc_id = -1;
-static int hf_adp_entity_type = -1;
+/* static int hf_adp_entity_type = -1; */
 
 /* Entity Capabilties Flags */
 static int hf_adp_entity_cap_efu_mode = -1;
@@ -2076,7 +2076,7 @@ static int hf_aecp_msrp_accumulated_latency = -1;
 static int hf_aecp_msrp_failure_bridge_id = -1;
 static int hf_aecp_msrp_failure_code = -1;
 static int hf_aecp_msrp_failure_valid_flag = -1;
-static int hf_aecp_stream_vlan_id = -1;
+/* static int hf_aecp_stream_vlan_id = -1; */
 static int hf_aecp_name = -1;
 static int hf_aecp_name_index = -1;
 static int hf_aecp_number_of_maps = -1;
@@ -2148,7 +2148,7 @@ static int hf_aecp_backedup_talker_unique_id = -1;
 static int hf_aecp_avb_info_ptp_grandmaster_id = -1;
 static int hf_aecp_avb_info_propegation_delay = -1;
 static int hf_aecp_avb_info_gptp_domain_number = -1;
-static int hf_aecp_avb_info_flags = -1;
+/* static int hf_aecp_avb_info_flags = -1; */
 static int hf_aecp_as_capable_flag = -1;
 static int hf_aecp_gptp_enabled_flag = -1;
 static int hf_aecp_srp_enabled_flag = -1;
@@ -2418,7 +2418,7 @@ static int ett_adp_ent_cap = -1;
 static int ett_adp_talk_cap = -1;
 static int ett_adp_list_cap = -1;
 static int ett_adp_cont_cap = -1;
-static int ett_adp_aud_format = -1;
+/* static int ett_adp_aud_format = -1; */
 static int ett_adp_samp_rates = -1;
 static int ett_adp_chan_format = -1;
 /* ACMP */
@@ -4928,10 +4928,12 @@ proto_register_17221(void)
          { "gPTP Grandmaster ID", "ieee17221.gptp_grandmaster_id",
             FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
+#if 0
       { &hf_adp_def_aud_format,
          { "Default Audio Format", "ieee17221.default_audio_format",
             FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
+#endif
 #if 0
       /* Default Audio Formats Fields Begin */
       { &hf_adp_def_aud_sample_rates,
@@ -5048,18 +5050,22 @@ proto_register_17221(void)
 #endif
       /* Channel Formats Fields End */
       /* Default Audio Formats Fields End */
+#if 0
       { &hf_adp_def_vid_format,
          { "Default Video Format", "ieee17221.default_video_format",
             FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
+#endif
       { &hf_adp_assoc_id,
          { "Assocation ID", "ieee17221.assocation_id",
             FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
+#if 0
       { &hf_adp_entity_type,
          { "Entity Type", "ieee17221.entity_type",
             FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
+#endif
       /*******************************************************************/
       { &hf_acmp_message_type,
          { "Message Type", "ieee17221.message_type",
@@ -5330,10 +5336,12 @@ proto_register_17221(void)
          {"gPTP Domain Number", "ieee17221.avb_info_gptp_domain_number",
             FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
+#if 0
       { &hf_aecp_avb_info_flags,
          {"Flags", "ieee17221.avbinfo_flags",
             FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
+#endif
 
       { &hf_aecp_as_capable_flag,
          { "AS Capable Flag", "ieee17221.as_capable_flag",
@@ -5395,10 +5403,12 @@ proto_register_17221(void)
          {"MSRP Failure Bridge ID", "ieee17221.msrp_failure_bridge_id",
             FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
+#if 0
       { &hf_aecp_stream_vlan_id,
          {"Stream VLAN ID", "ieee17221.stream_vlan_id",
              FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
+#endif
       { &hf_aecp_stream_vlan_id_valid_flag,
          {"Stream VLAN ID Valid Flag", "ieee17221.flags.stream_vlan_id_valid",
             FT_BOOLEAN, 32, NULL, AECP_STREAM_VLAN_ID_VALID_FLAG_MASK, NULL, HFILL }
@@ -6976,7 +6986,7 @@ proto_register_17221(void)
       &ett_adp_talk_cap,
       &ett_adp_list_cap,
       &ett_adp_cont_cap,
-      &ett_adp_aud_format,
+/*       &ett_adp_aud_format, */
       &ett_adp_samp_rates,
       &ett_adp_chan_format,
       &ett_acmp_flags,
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index de8d2d76e1..09308f8f61 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -243,9 +243,9 @@ static int hf_mac_lte_drx_config_short_cycle_timer = -1;
 
 static int hf_mac_lte_drx_state = -1;
 static int hf_mac_lte_drx_state_long_cycle_offset = -1;
-static int hf_mac_lte_drx_state_long_cycle_on = -1;
+/* static int hf_mac_lte_drx_state_long_cycle_on = -1; */
 static int hf_mac_lte_drx_state_short_cycle_offset = -1;
-static int hf_mac_lte_drx_state_short_cycle_on = -1;
+/* static int hf_mac_lte_drx_state_short_cycle_on = -1; */
 static int hf_mac_lte_drx_state_inactivity_remaining = -1;
 static int hf_mac_lte_drx_state_onduration_remaining = -1;
 static int hf_mac_lte_drx_state_retransmission_remaining = -1;
@@ -6682,24 +6682,28 @@ void proto_register_mac_lte(void)
               0, 0x0, NULL, HFILL
             }
         },
+#if 0
         { &hf_mac_lte_drx_state_long_cycle_on,
             { "Long cycle current on",
               "mac-lte.drx-state.long-cycle-on", FT_BOOLEAN, BASE_NONE,
               0, 0x0, NULL, HFILL
             }
         },
+#endif
         { &hf_mac_lte_drx_state_short_cycle_offset,
             { "Short cycle offset",
               "mac-lte.drx-state.short-cycle-offset", FT_UINT16, BASE_DEC,
               0, 0x0, NULL, HFILL
             }
         },
+#if 0
         { &hf_mac_lte_drx_state_short_cycle_on,
             { "Short cycle current on",
               "mac-lte.drx-state.short-cycle-on", FT_BOOLEAN, BASE_NONE,
               0, 0x0, NULL, HFILL
             }
         },
+#endif
         { &hf_mac_lte_drx_state_inactivity_remaining,
             { "Inactivity remaining",
               "mac-lte.drx-state.inactivity-remaining", FT_UINT16, BASE_DEC,
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index ebe5a5c703..dcbe2f5d54 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -110,7 +110,7 @@ static int hf_mip_pmipv4skipext_accesstechnology_type = -1;
 static int hf_mip_cvse_reserved = -1;
 static int hf_mip_cvse_vendor_org_id = -1;
 static int hf_mip_cvse_verizon_cvse_type = -1;
-static int hf_mip_cvse_3gpp2_cvse_type = -1;
+/* static int hf_mip_cvse_3gpp2_cvse_type = -1; */
 static int hf_mip_cvse_3gpp2_grekey = -1;
 static int hf_mip_cvse_vendor_cvse_type = -1;
 static int hf_mip_cvse_vendor_cvse_value = -1;
@@ -1358,11 +1358,13 @@ void proto_register_mip(void)
         FT_UINT16, BASE_DEC, VALS(mip_cvse_verizon_cvse_types), 0,
         NULL, HFILL }
     },
+#if 0
     { &hf_mip_cvse_3gpp2_cvse_type ,
       { "3GPP2 CVSE Type","mip.ext.cvse.3gpp2_type",
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
+#endif
     { &hf_mip_cvse_3gpp2_grekey,
       { "GRE Key","mip.ext.cvse.3gpp2_grekey",
         FT_UINT16, BASE_DEC, NULL, 0,
diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c
index 2ece6d529c..017d746f6a 100644
--- a/epan/dissectors/packet-openflow_v1.c
+++ b/epan/dissectors/packet-openflow_v1.c
@@ -50,11 +50,11 @@ static int hf_openflow_datapath_mac = -1;
 static int hf_openflow_datapath_impl = -1;
 static int hf_openflow_n_buffers = -1;
 static int hf_openflow_n_tables = -1;
-static int hf_openflow_auxiliary_id = -1;
-static int hf_openflow_pad3 = -1;
+/* static int hf_openflow_auxiliary_id = -1; */
+/* static int hf_openflow_pad3 = -1; */
 static int hf_openflow_capabilities = -1;
 static int hf_openflow_actions = -1;
-static int hf_openflow_reserved32 = -1;
+/* static int hf_openflow_reserved32 = -1; */
 static int hf_openflow_cap_flow_stats = -1;
 static int hf_openflow_table_stats = -1;
 static int hf_openflow_port_stats = -1;
@@ -118,12 +118,12 @@ static int hf_openflow_buffer_id = -1;
 static int hf_openflow_total_len = -1;
 static int hf_openflow_in_port = -1;
 static int hf_openflow_reason = -1;
-static int hf_openflow_table_id = -1;
+/* static int hf_openflow_table_id = -1; */
 static int hf_openflow_cookie = -1;
-static int hf_openflow_cookie_mask = -1;
+/* static int hf_openflow_cookie_mask = -1; */
 static int hf_openflow_padd8 = -1;
-static int hf_openflow_padd16 = -1;
-static int hf_openflow_padd48 = -1;
+/* static int hf_openflow_padd16 = -1; */
+/* static int hf_openflow_padd48 = -1; */
 static int hf_openflow_actions_len = -1;
 static int hf_openflow_action_type = -1;
 static int hf_openflow_action_len = -1;
@@ -139,7 +139,7 @@ static int hf_openflow_idle_timeout = -1;
 static int hf_openflow_hard_timeout = -1;
 static int hf_openflow_priority = -1;
 static int hf_openflow_out_port = -1;
-static int hf_openflow_out_group = -1;
+/* static int hf_openflow_out_group = -1; */
 static int hf_openflow_flags = -1;
 
 /* Initialize the subtree pointers */
@@ -840,16 +840,20 @@ proto_register_openflow_v1(void)
                FT_UINT8, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#if 0
         { &hf_openflow_auxiliary_id,
             { "auxiliary_id", "openflow.auxiliary_id",
                FT_UINT8, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
+#if 0
         { &hf_openflow_pad3,
             { "Padding", "openflow.pad3",
                FT_UINT24, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
         { &hf_openflow_capabilities,
             { "capabilities", "openflow.capabilities",
                FT_UINT32, BASE_HEX, NULL, 0x0,
@@ -860,11 +864,13 @@ proto_register_openflow_v1(void)
                FT_UINT32, BASE_HEX, NULL, 0x0,
                NULL, HFILL }
         },
+#if 0
         { &hf_openflow_reserved32,
             { "Reserved", "openflow.reserved32",
                FT_UINT32, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
         { &hf_openflow_cap_flow_stats,
             { "Flow statistics", "openflow.flow_stats",
                FT_BOOLEAN, 32, NULL, OFPC_FLOW_STATS,
@@ -1135,36 +1141,44 @@ proto_register_openflow_v1(void)
                FT_UINT8, BASE_DEC, VALS(openflow_reason_values), 0x0,
                NULL, HFILL }
         },
+#if 0
         { &hf_openflow_table_id,
             { "Table Id", "openflow.table_id",
                FT_UINT8, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
         { &hf_openflow_cookie,
             { "Cookie", "openflow.cookie",
                FT_UINT64, BASE_HEX, NULL, 0x0,
                NULL, HFILL }
         },
+#if 0
         { &hf_openflow_cookie_mask,
             { "Cookie mask", "openflow.cookie",
                FT_UINT64, BASE_HEX, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
         { &hf_openflow_padd8,
             { "Padding", "openflow.padding8",
                FT_UINT8, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#if 0
         { &hf_openflow_padd16,
             { "Padding", "openflow.padding16",
                FT_UINT16, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
+#if 0
         { &hf_openflow_padd48,
             { "Padding", "openflow.padding48",
                FT_UINT64, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
         { &hf_openflow_actions_len,
             { "Actions length", "openflow.actions_len",
                FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1240,11 +1254,13 @@ proto_register_openflow_v1(void)
                FT_UINT32, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#if 0
         { &hf_openflow_out_group,
             { "Out group", "openflow.out_group",
                FT_UINT32, BASE_DEC, NULL, 0x0,
                NULL, HFILL }
         },
+#endif
         { &hf_openflow_flags,
             { "Flags", "openflow.flags",
                FT_UINT16, BASE_DEC, NULL, 0x0,