Comment out numerous unused hf_.... instances found by checkhf.

svn path=/trunk/; revision=47617

5 files changed, 34 insertions, 16 deletions

diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 0740c98c06..a3c0ce198a 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -107,24 +107,24 @@ static int hf_ams_adsadddnresponse = -1;
 static int hf_ams_adsdeldnrequest = -1;
 static int hf_ams_adsdeldnresponse = -1;
 static int hf_ams_adsdnrequest = -1;
-static int hf_ams_adsdnresponse = -1;
-static int hf_ams_adsnoteattrib = -1;
-static int hf_ams_adsnoteblocks = -1;
-static int hf_ams_adsversion = -1;
+/* static int hf_ams_adsdnresponse = -1; */
+/* static int hf_ams_adsnoteattrib = -1; */
+/* static int hf_ams_adsnoteblocks = -1; */
+/* static int hf_ams_adsversion = -1; */
 static int hf_ams_adsdevicename = -1;
 static int hf_ams_adsversionversion = -1;
 static int hf_ams_adsversionrevision = -1;
 static int hf_ams_adsversionbuild = -1;
 static int hf_ams_adsnoteblocksstamps = -1;
-static int hf_ams_adsnoteblocksstamp = -1;
-static int hf_ams_adstimestamp = -1;
-static int hf_ams_adssamplecnt = -1;
-static int hf_ams_adsnoteblockssample = -1;
+/* static int hf_ams_adsnoteblocksstamp = -1; */
+/* static int hf_ams_adstimestamp = -1; */
+/* static int hf_ams_adssamplecnt = -1; */
+/* static int hf_ams_adsnoteblockssample = -1; */
 static int hf_ams_adstransmode = -1;
 static int hf_ams_adsmaxdelay = -1;
 static int hf_ams_adscycletime = -1;
-static int hf_ams_adscmpmax = -1;
-static int hf_ams_adscmpmin = -1;
+/* static int hf_ams_adscmpmax = -1; */
+/* static int hf_ams_adscmpmin = -1; */
 
 static const value_string TransMode[] =
 {
@@ -1098,6 +1098,7 @@ void proto_register_ams(void)
       FT_NONE, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ams_adsdnresponse,
       { "ADS Device Notification Response", "ams.ads_dn_res",
       FT_NONE, BASE_NONE, NULL, 0x0,
@@ -1118,6 +1119,7 @@ void proto_register_ams(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       NULL, HFILL }
       },
+#endif
       { &hf_ams_adsdevicename,
       { "Device Name","ams.ads_devicename",
       FT_STRING, BASE_NONE, NULL, 0x0,
@@ -1143,6 +1145,7 @@ void proto_register_ams(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ams_adsnoteblocksstamp,
       { "Notification Stamp", "ams.ads_noteblocksstamp",
       FT_NONE, BASE_NONE, NULL, 0x0,
@@ -1163,6 +1166,7 @@ void proto_register_ams(void)
       FT_NONE, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
       },
+#endif
       { &hf_ams_adstransmode,
       { "Trans Mode", "ams.ads_transmode",
       FT_UINT32, BASE_DEC, VALS(TransMode), 0x0,
@@ -1178,6 +1182,7 @@ void proto_register_ams(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ams_adscmpmax,
       { "Cmp Mad", "ams.ads_cmpmax",
       FT_NONE, BASE_NONE, NULL, 0x0,
@@ -1188,6 +1193,7 @@ void proto_register_ams(void)
       FT_NONE, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
       }
+#endif
    };
 
    static gint *ett[] =
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index 3ab266c3f4..46c8995bf5 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -114,7 +114,7 @@ static int hf_ecat_mailbox_coe_sdoccsds_toggle = -1;
 static int hf_ecat_mailbox_coe_sdoccsus = -1;
 static int hf_ecat_mailbox_coe_sdoccsus_toggle = -1;
 static int hf_ecat_mailbox_coe_sdoccsiu = -1;
-static int hf_ecat_mailbox_coe_sdoccsiu_complete = -1;
+/* static int hf_ecat_mailbox_coe_sdoccsiu_complete = -1; */
 static int hf_ecat_mailbox_coe_sdoidx = -1;
 static int hf_ecat_mailbox_coe_sdosub = -1;
 static int hf_ecat_mailbox_coe_sdodata = -1;
@@ -122,7 +122,7 @@ static int hf_ecat_mailbox_coe_sdodata1 = -1;
 static int hf_ecat_mailbox_coe_sdodata2 = -1;
 static int hf_ecat_mailbox_coe_sdoldata = -1;
 static int hf_ecat_mailbox_coe_sdolength = -1;
-static int hf_ecat_mailbox_coe_sdoerror = -1;
+/* static int hf_ecat_mailbox_coe_sdoerror = -1; */
 static int hf_ecat_mailbox_coe_sdores = -1;
 static int hf_ecat_mailbox_coe_sdoscsds = -1;
 static int hf_ecat_mailbox_coe_sdoscsds_toggle = -1;
@@ -1673,11 +1673,13 @@ void proto_register_ecat_mailbox(void)
       FT_UINT8, BASE_HEX, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ecat_mailbox_coe_sdoccsiu_complete,
       { "Toggle Bit", "ecat_mailbox.coe.sdoccsiu_complete",
       FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010,
       NULL, HFILL }
       },
+#endif
       { &hf_ecat_mailbox_coe_sdoccsus,
       { "Upload Segment", "ecat_mailbox.coe.sdoccsus",
       FT_UINT8, BASE_HEX, NULL, 0x0,
@@ -1724,11 +1726,13 @@ void proto_register_ecat_mailbox(void)
       FT_UINT32, BASE_HEX, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ecat_mailbox_coe_sdoerror,
       { "SDO Error", "ecat_mailbox.coe.sdoerror",
       FT_UINT32, BASE_HEX, NULL, 0x0,
       NULL, HFILL }
       },
+#endif
       { &hf_ecat_mailbox_coe_sdores,
       { "SDO Res", "ecat_mailbox.coe.sdores",
       FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index 60dacf25e7..68908e8c78 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -63,7 +63,7 @@ static int hf_ecat_sub_ado[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static int hf_ecat_sub_adp[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static int hf_ecat_sub_lad[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 
-static int hf_ecat_header = -1;
+/* static int hf_ecat_header = -1; */
 static int hf_ecat_data = -1;
 static int hf_ecat_cnt = -1;
 static int hf_ecat_cmd = -1;
@@ -71,7 +71,7 @@ static int hf_ecat_idx = -1;
 static int hf_ecat_adp = -1;
 static int hf_ecat_ado = -1;
 static int hf_ecat_lad = -1;
-static int hf_ecat_len = -1;
+/* static int hf_ecat_len = -1; */
 static int hf_ecat_int = -1;
 static int hf_ecat_syncman = -1;
 static int hf_ecat_syncman_start = -1;
@@ -876,10 +876,12 @@ void proto_register_ecat(void)
       { "EtherCAT Frame", "ecat.sub", FT_BYTES, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ecat_header,
       { "eader", "ecat.header",
       FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
+#endif
       { &hf_ecat_sub_data[0],
       {  "Data", "ecat.sub1.data",
       FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
@@ -1232,11 +1234,13 @@ void proto_register_ecat(void)
       FT_UINT32, BASE_HEX, NULL, 0x0,
       NULL, HFILL }
       },
+#if 0
       { &hf_ecat_len,
       { "Length", "ecat.len",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       NULL, HFILL }
       },
+#endif
       { &hf_ecat_int,
       { "Interrupt", "ecat.int",
       FT_UINT16, BASE_HEX, NULL, 0x0,
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c
index 5793c065d8..2b93188082 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/ethercat/packet-ioraw.c
@@ -39,7 +39,7 @@ int proto_ioraw  = -1;
 
 static int ett_ioraw = -1;
 
-static int hf_ioraw_summary = -1;
+/* static int hf_ioraw_summary = -1; */
 static int hf_ioraw_header = -1;
 static int hf_ioraw_data = -1;
 
@@ -84,11 +84,13 @@ void proto_register_ioraw(void)
 {
    static hf_register_info hf[] =
    {
+#if 0
       { &hf_ioraw_summary,
       { "Summary of the IoRaw Packet", "ioraw.summary",
       FT_STRING, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
       },
+#endif
       { &hf_ioraw_header, { "Header", "ioraw.header",
       FT_NONE, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c
index 1ecaca676c..706315d461 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/ethercat/packet-nv.c
@@ -42,7 +42,7 @@ static int ett_nv_header = -1;
 static int ett_nv_var = -1;
 static int ett_nv_varheader = -1;
 
-static int hf_nv_summary = -1;
+/* static int hf_nv_summary = -1; */
 static int hf_nv_header = -1;
 static int hf_nv_publisher = -1;
 static int hf_nv_count = -1;
@@ -165,11 +165,13 @@ void proto_register_nv(void)
 {
    static hf_register_info hf[] =
    {
+#if 0
       { &hf_nv_summary,
       { "Summary of the Nv Packet", "tc_nv.summary",
       FT_BYTES, BASE_NONE, NULL, 0x0,
       NULL, HFILL }
       },
+#endif
       { &hf_nv_header, { "Header", "tc_nv.header",
       FT_NONE, BASE_NONE, NULL, 0x0,
       NULL, HFILL }