10 files changed, 19 insertions, 17 deletions

diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index ca1edaf8d0..dcee8757cb 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -165,7 +165,7 @@ const value_string gsm_a_dtap_msg_rr_strings[] = {
     {    0, NULL }
 };
 
-const value_string gsm_a_dtap_msg_rr_ec_ccch_strings[] = {
+static const value_string gsm_a_dtap_msg_rr_ec_ccch_strings[] = {
     /* Channel establishment messages */
     { 0x01, "EC-Immediate Assignment Type 2" },
     { 0x02, "EC-Immediate Assignment Reject" },
@@ -334,7 +334,7 @@ static const value_string gsm_rr_elem_strings[] = {
 };
 value_string_ext gsm_rr_elem_strings_ext = VALUE_STRING_EXT_INIT(gsm_rr_elem_strings);
 
-const value_string gsm_rr_rest_octets_elem_strings[] = {
+static const value_string gsm_rr_rest_octets_elem_strings[] = {
     /* RR Rest Octets information elements */
     { 0, "UTRAN FDD Description" },
     { 0, "UTRAN TDD Description" },
@@ -403,7 +403,7 @@ const value_string gsm_rr_rest_octets_elem_strings[] = {
 
 /* RR cause value (octet 2) 3GPP TS 24.018, section 10.5.2.31 */
 /* public symbol for packet-gsm_gsup.c */
-const value_string gsm_a_rr_RR_cause_vals[] = {
+static const value_string gsm_a_rr_RR_cause_vals[] = {
     {    0, "Normal event"},
     {    1, "Abnormal release, unspecified"},
     {    2, "Abnormal release, channel unacceptable"},
@@ -12125,10 +12125,12 @@ get_rr_short_pd_msg_params(guint8 mess_type, const gchar **msg_str, int *ett_tre
     }
 }
 
+#if 0
 const value_string short_protocol_discriminator_vals[] = {
     {0x0, "Radio Resources Management messages"},
     {  0, NULL }
 };
+#endif
 
 static int
 dissect_sacch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c
index b554a5de24..eb5cd27c99 100644
--- a/epan/dissectors/packet-gsm_cbch.c
+++ b/epan/dissectors/packet-gsm_cbch.c
@@ -21,7 +21,7 @@ void proto_reg_handoff_gsm_cbch(void);
 
 #define CBCH_FRAGMENT_SIZE 22
 
-const value_string block_type_lpd_strings[] = {
+static const value_string block_type_lpd_strings[] = {
     { 0x00, "NOT Cell Broadcast"},
     { 0x01, "Cell Broadcast"},
     { 0x02, "NOT Cell Broadcast"},
@@ -29,7 +29,7 @@ const value_string block_type_lpd_strings[] = {
     {    0, NULL}
 };
 
-const value_string block_type_seq_num_values[] = {
+static const value_string block_type_seq_num_values[] = {
     { 0x00, "First Block"},
     { 0x01, "Second Block"},
     { 0x02, "Third Block"},
@@ -39,7 +39,7 @@ const value_string block_type_seq_num_values[] = {
     {    0, NULL}
 };
 
-const value_string sched_type_values[] = {
+static const value_string sched_type_values[] = {
     { 0x00, "messages formatted as specified in subclause 3.5 of 3GPP 44.012"},
     { 0xFF, "Unknown schedule message format"},
     {    0, NULL}
diff --git a/epan/dissectors/packet-gsm_r_uus1.c b/epan/dissectors/packet-gsm_r_uus1.c
index 7149f66502..a6371bb287 100644
--- a/epan/dissectors/packet-gsm_r_uus1.c
+++ b/epan/dissectors/packet-gsm_r_uus1.c
@@ -117,7 +117,7 @@ static gboolean gsm_a_u2u = TRUE;
 
 static expert_field ei_gsm_r_uus1_not_implemented_yet = EI_INIT;
 
-const value_string gsm_r_uus1_tags[] = {
+static const value_string gsm_r_uus1_tags[] = {
     { 2,  "Acknowledgement by Receiver of a HPC and response from device accepting the acknowledgement" },
     { 3,  "Acknowledgement by Initiator of a HPC" },
     { 5,  "Presentation of Functional Number" },
@@ -359,7 +359,7 @@ static const true_false_string gsm_r_uus1_elda_long_hem = {
     "East"
 };
 
-const value_string gsm_r_uus1_elda_scale_vals[] = {
+static const value_string gsm_r_uus1_elda_scale_vals[] = {
     { 0,  "10 cm resolution" },
     { 1,  "1 metre resolution" },
     { 2,  "10 metre resolution" },
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index c16d464651..470202e5d8 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -462,7 +462,7 @@ sm_fragment_free_persistent_key(gpointer ptr)
     }
 }
 
-const reassembly_table_functions
+static const reassembly_table_functions
 sm_reassembly_table_functions = {
     sm_fragment_hash,
     sm_fragment_equal,
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 065f3e70d7..f9e74286f4 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -1021,7 +1021,7 @@ static const range_string nr_up_cause_vals[] = {
 };
 
 
-const true_false_string tfs_final_frame_indication = {
+static const true_false_string tfs_final_frame_indication = {
     "Frame is final",
     "Frame is not final"
 };
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 7430d564c7..a6746af2b6 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -5709,7 +5709,7 @@ static const value_string gtpv2_apn_restriction_vals[] = {
     {4, "Private-2"},
     {0, NULL}
 };
-value_string_ext gtpv2_apn_restriction_vals_ext = VALUE_STRING_EXT_INIT(gtpv2_apn_restriction_vals);
+static value_string_ext gtpv2_apn_restriction_vals_ext = VALUE_STRING_EXT_INIT(gtpv2_apn_restriction_vals);
 
 static void
 dissect_gtpv2_apn_rest(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_, session_args_t * args _U_)
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c
index 6a17cff2ee..a7c13684f0 100644
--- a/epan/dissectors/packet-gvcp.c
+++ b/epan/dissectors/packet-gvcp.c
@@ -673,7 +673,7 @@ static const true_false_string zonedirectionnames = {
 brief Register name to address mappings
 */
 
-const value_string bootstrapregisternames[] = {
+static const value_string bootstrapregisternames[] = {
 	{ GVCP_VERSION, "[Version]" },
 	{ GVCP_DEVICE_MODE, "[Device Mode]" },
 	{ GVCP_DEVICE_MAC_HIGH_0, "[Device MAC address High (Net #0)]" },
@@ -845,7 +845,7 @@ brief Extended Register name to address mappings
 */
 
 /* GEV 2.2 */
-const value_string extendedbootstrapregisternames[] = {
+static const value_string extendedbootstrapregisternames[] = {
 	{ GVCP_SC_GENDC_DESCRIPTOR_ADDRESS, "[SCGDAx (GenDC Descriptor Address)]" },
 	{ GVCP_SC_GENDC_DESCRIPTOR_SIZE, "[SCGDSx (GenDC Descriptor Size)]" },
 	{ GVCP_SC_GENDC_FLOW_MAPPING_TABLE_ADDRESS, "[SCGFTAx (GenDC Flow Mapping Table Address)]" },
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index f1cd197715..2c9fb075cd 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -27,7 +27,7 @@ static int hf_h221_nonstd_netmeeting_non_standard = -1;
  */
 static int ett_nonstd = -1;
 
-const value_string ms_codec_vals[] = {
+static const value_string ms_codec_vals[] = {
     {  0x0111, "L&H CELP 4.8k" },
     {  0x0200, "MS-ADPCM" },
     {  0x0211, "L&H CELP 8k" },
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index af3a2f7a74..233cf37980 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -867,7 +867,7 @@ static void dissect_h248_annexc_SDP_M(proto_tree* tree, tvbuff_t* tvb, packet_in
 	}
 }
 
-gboolean h248_c_implicit = TRUE;
+static gboolean h248_c_implicit = TRUE;
 
 static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x1001, &hf_h248_pkg_annexc_media, h248_param_ber_integer, NULL },
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 2e83dad021..bfb4edc725 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -50,7 +50,7 @@ static const value_string h248_pkg_BCP_props_vals[] = {
 };
 
 /* Properties */
-h248_pkg_param_t h248_pkg_BCP_props[] = {
+static h248_pkg_param_t h248_pkg_BCP_props[] = {
     { 0x0001, &hf_h248_pkg_BCP_BNCChar, h248_param_ber_integer, &implicit },
     { 0, NULL, NULL, NULL}
 };
@@ -137,7 +137,7 @@ static const value_string h248_pkg_RII_vals[]  = {
 };
 
 /* Properties */
-h248_pkg_param_t h248_pkg_RI_props[] = {
+static h248_pkg_param_t h248_pkg_RI_props[] = {
     { 0x0001, &hf_h248_pkg_RII, h248_param_ber_integer, &implicit },
     { 0, NULL, NULL, NULL}
 };