Fix (using '#if 0') various [-Wunused-const-variable] warnings

svn path=/trunk/; revision=52794

8 files changed, 65 insertions, 2 deletions

diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c
index 50937cdf8f..6c752460a7 100644
--- a/plugins/wimax/msg_arq.c
+++ b/plugins/wimax/msg_arq.c
@@ -78,15 +78,19 @@ static gint hf_arq_reset_reserved	= -1;
 
 /* STRING RESOURCES */
 
+#if 0
 static const true_false_string tfs_present = {
 	"present",
 	"absent"
 };
+#endif
 
+#if 0
 static const true_false_string tfs_rng_req_aas_broadcast = {
 	"SS cannot receive broadcast messages",
 	"SS can receive broadcast messages"
 };
+#endif
 
 static const true_false_string tfs_arq_last = {
 	"Last ARQ feedback IE in the list",
diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c
index 1d2942177c..ec4e81aa05 100644
--- a/plugins/wimax/msg_dcd.c
+++ b/plugins/wimax/msg_dcd.c
@@ -186,18 +186,22 @@ static const value_string vals_dcd_power_adjustmnt[] =
     {0,  NULL}
 };
 
+#if 0
 static const true_false_string tfs_dcd_power_adjustment =
 {
     "Preserve Mean Power",
     "Preserve Peak Power"
 };
+#endif
 
+#if 0
 static const value_string vals_reg_rsp_status[] =
 {
     {0, "OK"},
     {1, "Message authentication failure"},
     {0,  NULL}
 };
+#endif
 
 static const value_string vals_dcd_burst_tcs[] =
 {
@@ -206,11 +210,13 @@ static const value_string vals_dcd_burst_tcs[] =
     {0,  NULL}
 };
 
+#if 0
 static const true_false_string tfs_dcd_burst_tcs =
 {
     "TCS enabled",
     "TCS disabled"
 };
+#endif
 
 static const value_string vals_dcd_frame_duration[] =
 {
diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c
index caf1919284..b7f9fea23c 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/wimax/msg_dlmap.c
@@ -173,6 +173,7 @@ static gint ett_308a = -1;
 #define DL_MAP_NCT_DM   1
 #define DL_MAP_NCT_PTP  2
 
+#if 0
 /* NCT messages */
 static const value_string nct_msgs[] =
 {
@@ -181,6 +182,7 @@ static const value_string nct_msgs[] =
     { DL_MAP_NCT_PMP, "PTP" },
     { 0,  NULL }
 };
+#endif
 
 /* Repetition Coding Indications */
 static const value_string rep_msgs[] =
diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c
index c2cf8c0b3c..d4125ea732 100644
--- a/plugins/wimax/msg_reg_req.c
+++ b/plugins/wimax/msg_reg_req.c
@@ -169,15 +169,19 @@ static const true_false_string tfs_reg_ss_mgmt_support = {
     "no secondary management connection"
 };
 
+#if 0
 static const true_false_string tfs_arq_enable = {
 	    "ARQ Requested/Accepted",
 	        "ARQ Not Requested/Accepted"
 };
+#endif
 
+#if 0
 static const true_false_string tfs_arq_deliver_in_order = {
 	    "Order of delivery is preserved",
 	        "Order of delivery is not preserved"
 };
+#endif
 
 static const true_false_string tfs_reg_fbss_mdho_ho_disable = {
     "Disable",
diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c
index 15b5040d8b..39bc9f668c 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/wimax/msg_sbc.c
@@ -296,18 +296,24 @@ static const true_false_string tfs_sbc_bw_alloc_support_duplex =
     "Half-Duplex"
 };
 
+#if 0
 static const value_string vals_sbc_mac_pdu_fsn[] =
 {
     {0, "Only 11-bit FSN values are supported"},
     {1, "Only 3-bit FSN values are supported"},
     {0,  NULL}
 };
+#endif
+
+#if 0
 static const true_false_string tfs_sbc_mac_pdu_fsn =
 {
     "Only 3-bit FSN values are supported",
     "Only 11-bit FSN values are supported"
 };
+#endif
 
+#if 0
 /* DCD DIUC messages (table 143) */
 static const value_string diuc_msgs[] =
 {
@@ -329,7 +335,9 @@ static const value_string diuc_msgs[] =
     { 15, "End of DL-MAP" },
     {0,   NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_type[] =
 {
     {0, "CINR metric"},
@@ -338,7 +346,9 @@ static const value_string vals_sbc_type[] =
     {3, "Reserved"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_function[] =
 {
     {0, "Reserved"},
@@ -351,7 +361,9 @@ static const value_string vals_sbc_function[] =
     {7, "Reserved"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_action[] =
 {
     {0, "Reserved"},
@@ -361,40 +373,52 @@ static const value_string vals_sbc_action[] =
     {4, "Reserved"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_power_adjustmnt[] =
 {
     {0, "Preserve Peak Power"},
     {1, "Preserve Mean Power"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const true_false_string tfs_sbc_power_adjustment =
 {
     "Preserve Mean Power",
     "Preserve Peak Power"
 };
+#endif
 
+#if 0
 static const value_string vals_reg_rsp_status[] =
 {
     {0, "OK"},
     {1, "Message authentication failure"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_burst_tcs[] =
 {
     {0, "TCS disabled"},
     {1, "TCS enabled"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const true_false_string tfs_sbc_burst_tcs =
 {
     "TCS enabled",
     "TCS disabled"
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_frame_duration[] =
 {
     {0, "2.5"},
@@ -406,7 +430,9 @@ static const value_string vals_sbc_frame_duration[] =
     {6, "20"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_mac_version[] =
 {
     {1, "Conformance with IEEE Std 802.16-2001"},
@@ -417,7 +443,9 @@ static const value_string vals_sbc_mac_version[] =
     {6, "reserved"},
     {0, NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_burst_fec[] =
 {
     {0, "QPSK (CC) 1/2"},
@@ -475,7 +503,9 @@ static const value_string vals_sbc_burst_fec[] =
     {52, "64-QAM (LDPC) 5/6"},
     {0,  NULL}
 };
+#endif
 
+#if 0
 static const value_string vals_sbc_permutation_type[] =
 {
     {0, "PUSC" },
@@ -484,6 +514,7 @@ static const value_string vals_sbc_permutation_type[] =
     {3, "AMC"},
     {0,  NULL}
 };
+#endif
 
 static const value_string vals_sbc_harq_parameters_set[] =
 {
diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c
index 3a5163ada3..a8f3d346a6 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/wimax/msg_ucd.c
@@ -123,12 +123,14 @@ static gint hf_ucd_periodic_ranging_backoff_end = -1;
 /* static gint hf_ucd_unknown_type = -1; */
 static gint hf_ucd_invalid_tlv = -1;
 
+#if 0
 static const value_string vals_dcd_burst_tcs[] =
 {
 	{0, "TCS disabled"},
 	{1, "TCS enabled"},
 	{0,  NULL}
 };
+#endif
 
 static const value_string vals_dcd_burst_fec[] =
 {
@@ -1217,4 +1219,4 @@ void proto_reg_handoff_mac_mgmt_msg_ucd(void)
 
 	ucd_handle = create_dissector_handle(dissect_mac_mgmt_msg_ucd_decoder, proto_mac_mgmt_msg_ucd_decoder);
 	dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_UCD, ucd_handle);
-}
\ No newline at end of file
+}
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c
index 098bb9700c..035d370937 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/wimax/msg_ulmap.c
@@ -163,6 +163,7 @@ static gint ett_315d = -1;
 #define UL_MAP_NCT_DM   1
 #define UL_MAP_NCT_PTP  2
 
+#if 0
 /* NCT messages */
 static const value_string nct_msgs[] =
 {
@@ -171,7 +172,9 @@ static const value_string nct_msgs[] =
     { UL_MAP_NCT_PMP, "PTP" },
     { 0,  NULL }
 };
+#endif
 
+#if 0
 /* Repetition Coding Indications */
 static const value_string rep_msgs[] =
 {
@@ -181,7 +184,9 @@ static const value_string rep_msgs[] =
     { 3, "Repetition Coding of 6 Used" },
     { 0,  NULL }
 };
+#endif
 
+#if 0
 /* DL Frame Prefix Coding Indications */
 static const value_string boost_msgs[] =
 {
@@ -195,6 +200,7 @@ static const value_string boost_msgs[] =
     { 7, "-12dB" },
     { 0,  NULL }
 };
+#endif
 
 /* ul-map fields */
 static gint hf_ulmap_reserved = -1;
@@ -2405,4 +2411,4 @@ void proto_reg_handoff_mac_mgmt_msg_ulmap(void)
 
 	ulmap_handle = create_dissector_handle(dissect_mac_mgmt_msg_ulmap_decoder, proto_mac_mgmt_msg_ulmap_decoder);
 	dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_UL_MAP, ulmap_handle);
-}
\ No newline at end of file
+}
diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c
index 0ea5be75f0..89cb2fc93c 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/wimax/wimax_utils.c
@@ -139,11 +139,13 @@ static const value_string vals_arq_enable[] =
 	{1, "ARQ requested/accepted"},
 	{0,  NULL}
 };
+#if 0
 static const value_string vals_arq_block_lifetime[] =
 {
 	{0, "Infinite"},
 	{0, NULL}
 };
+#endif
 static const value_string vals_arq_sync_loss_timeout[] =
 {
 	{0, "Infinite"},
@@ -294,17 +296,21 @@ static const true_false_string tfs_supported =
     "not supported"
 };
 
+#if 0
 static const true_false_string disabled_enabled =
 {
 	"enabled",
 	"disabled"
 };
+#endif
 
+#if 0
 static const true_false_string default_enabled =
 {
 	"enabled",
 	"use default action"
 };
+#endif
 
 static const value_string vals_pkm_attr_error_codes[] =
 {	/* table 373 */
@@ -333,12 +339,14 @@ static const value_string va_key_push_modes[] =
 	{0,  NULL}
 };
 
+#if 0
 static const value_string vals_pkm_version[] =
 {
 	{0, "Reserved"},
 	{1, "PKM (Initial standard release"},
 	{0,  NULL}
 };
+#endif
 
 static const value_string vs_success_reject[] =
 {