Make some more variables and functions static.

13 files changed, 45 insertions, 43 deletions

diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 6fb338a341..580be7723b 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -1369,7 +1369,7 @@ static const value_string cip_pccc_es_st_vals[] = {
    { 0,                          NULL }
 };
 
-value_string_ext cip_pccc_es_st_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_es_st_vals);
+static value_string_ext cip_pccc_es_st_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_es_st_vals);
 
 /* Translate PCCC Function Codes */
 static const value_string cip_pccc_fnc_06_vals[] = {
@@ -1388,7 +1388,7 @@ static const value_string cip_pccc_fnc_06_vals[] = {
    { 0,                          NULL }
 };
 
-value_string_ext cip_pccc_fnc_06_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_fnc_06_vals);
+static value_string_ext cip_pccc_fnc_06_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_fnc_06_vals);
 
 static const value_string cip_pccc_fnc_07_vals[] = {
     { PCCC_FNC_07_00, "Disable outputs" },
@@ -1401,7 +1401,7 @@ static const value_string cip_pccc_fnc_07_vals[] = {
    { 0,                          NULL }
 };
 
-value_string_ext cip_pccc_fnc_07_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_fnc_07_vals);
+static value_string_ext cip_pccc_fnc_07_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_fnc_07_vals);
 
 static const value_string cip_pccc_fnc_0f_vals[] = {
     { PCCC_FNC_0F_00, "Word range write" },
@@ -1448,7 +1448,7 @@ static const value_string cip_pccc_fnc_0f_vals[] = {
    { 0,                          NULL }
 };
 
-value_string_ext cip_pccc_fnc_0f_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_fnc_0f_vals);
+static value_string_ext cip_pccc_fnc_0f_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_fnc_0f_vals);
 
 /* Translate PCCC File Types */
 static const value_string cip_pccc_file_types_vals[] = {
@@ -1480,7 +1480,7 @@ static const value_string cip_pccc_file_types_vals[] = {
    { 0,                          NULL }
 };
 
-value_string_ext cip_pccc_file_type_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_file_types_vals);
+static value_string_ext cip_pccc_file_type_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_file_types_vals);
 
 /* Translate PCCC CPU Modes */
 #if 0
@@ -1504,7 +1504,7 @@ static const value_string cip_pccc_cpu_mode_80_vals[] = {
    { 0,                          NULL }
 };
 
-value_string_ext cip_pccc_cpu_mode_80_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_cpu_mode_80_vals);
+static value_string_ext cip_pccc_cpu_mode_80_vals_ext = VALUE_STRING_EXT_INIT(cip_pccc_cpu_mode_80_vals);
 
 /* Translate Vendor IDs */
 static const value_string cip_vendor_vals[] = {
@@ -2900,7 +2900,7 @@ const value_string cip_class_names_vals[] = {
    { 0,        NULL                             }
 };
 
-const value_string cip_id_state_vals[] = {
+static const value_string cip_id_state_vals[] = {
    { 0, "Nonexistent" },
    { 1, "Device Self Testing" },
    { 2, "Standby" },
@@ -2911,7 +2911,7 @@ const value_string cip_id_state_vals[] = {
    { 0, NULL }
 };
 
-const range_string cip_port_type_vals[] = {
+static const range_string cip_port_type_vals[] = {
    { 0, 0, "Any - no routing" },
    { 1, 1, "Reserved for legacy use" },
    { 2, 2, "ControlNet" },
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c
index df065803fa..9f1689ecb7 100644
--- a/epan/dissectors/packet-couchbase.c
+++ b/epan/dissectors/packet-couchbase.c
@@ -858,14 +858,14 @@ static const value_string opcode_vals[] = {
 
 static value_string_ext opcode_vals_ext = VALUE_STRING_EXT_INIT(opcode_vals);
 
-const value_string dcp_connection_type_vals[] = {
+static const value_string dcp_connection_type_vals[] = {
   {0, "Consumer"},
   {1, "Producer"},
   {2, "Notifier"},
   {0, NULL}
 };
 
-const value_string vbucket_states_vals[] = {
+static const value_string vbucket_states_vals[] = {
   {1, "Active"},
   {2, "Replica"},
   {3, "Pending"},
diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c
index bf9cc3292b..5f3ee215d8 100644
--- a/epan/dissectors/packet-csn1.c
+++ b/epan/dissectors/packet-csn1.c
@@ -19,7 +19,7 @@
 
 void proto_register_csn1(void);
 
-int hf_null_data = -1;
+static int hf_null_data = -1;
 
 static expert_field ei_csn1_more_bits_to_unpack = EI_INIT;
 static expert_field ei_csn1_general = EI_INIT;
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c
index d3ef88542f..ceccac9720 100644
--- a/epan/dissectors/packet-dbus.c
+++ b/epan/dissectors/packet-dbus.c
@@ -100,9 +100,9 @@ static const value_string endianness_vals[] = {
 	{ 'B', "big-endian" },
 	{ 0, NULL }
 };
-const true_false_string allow_vals = { "Allow", "Don't allow" };
-const true_false_string no_start_vals = { "Don't start", "Start" };
-const true_false_string not_expected_vals = { "Not expected", "Expected" };
+static const true_false_string allow_vals = { "Allow", "Don't allow" };
+static const true_false_string no_start_vals = { "Don't start", "Start" };
+static const true_false_string not_expected_vals = { "Not expected", "Expected" };
 
 static int hf_dbus_endianness = -1;
 static int hf_dbus_message_type = -1;
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index e5cacf4dac..7e6a0d69ee 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -3111,7 +3111,7 @@ static const value_string diameter_3gpp_qos_reliability_vals[] = {
     { 0, NULL }
 };
 
-const range_string diameter_3gpp_qos_delay_cls_vals[] = {
+static const range_string diameter_3gpp_qos_delay_cls_vals[] = {
     { 0x00, 0x00, "Subscribed delay class (in MS to net); Reserved (in net to MS)" },
     { 0x01, 0x01, "Delay class 1" },
     { 0x02, 0x02, "Delay class 2" },
@@ -3122,7 +3122,7 @@ const range_string diameter_3gpp_qos_delay_cls_vals[] = {
     { 0, 0, NULL }
 };
 
-const range_string diameter_3gpp_qos_prec_class_vals[] = {
+static const range_string diameter_3gpp_qos_prec_class_vals[] = {
     { 0x00, 0x00, "Subscribed precedence (MS to net); Reserved (net to MS)" },
     { 0x01, 0x01, "High priority" },
     { 0x02, 0x02, "Normal priority" },
@@ -3132,7 +3132,7 @@ const range_string diameter_3gpp_qos_prec_class_vals[] = {
     { 0, 0, NULL }
 };
 
-const range_string diameter_3gpp_qos_peak_thr_vals[] = {
+static const range_string diameter_3gpp_qos_peak_thr_vals[] = {
     { 0x00, 0x00, "Subscribed peak throughput (MS to net); Reserved (net to MS)" },
     { 0x01, 0x01, "Up to 1 000 octet/s" },
     { 0x02, 0x02, "Up to 2 000 octet/s" },
@@ -3148,7 +3148,7 @@ const range_string diameter_3gpp_qos_peak_thr_vals[] = {
     { 0, 0, NULL }
 };
 
-const range_string diameter_3gpp_qos_mean_thr_vals[] = {
+static const range_string diameter_3gpp_qos_mean_thr_vals[] = {
     { 0x00, 0x00, "Subscribed peak throughput (MS to net); Reserved (net to MS)" },
     { 0x01, 0x01, "100 octet/h" },
     { 0x02, 0x02, "200 octet/h" },
@@ -3174,7 +3174,7 @@ const range_string diameter_3gpp_qos_mean_thr_vals[] = {
     { 0, 0, NULL }
 };
 
-const value_string diameter_3gpp_qos_del_of_err_sdu_vals[] = {
+static const value_string diameter_3gpp_qos_del_of_err_sdu_vals[] = {
     { 0x00, "Subscribed delivery of erroneous SDUs (MS to net); Reserved (net to MS)" },
     { 0x01, "No detect ('-')" },
     { 0x02, "Erroneous SDUs are delivered ('yes')" },
@@ -3183,7 +3183,7 @@ const value_string diameter_3gpp_qos_del_of_err_sdu_vals[] = {
     { 0, NULL }
 };
 
-const value_string diameter_3gpp_qos_del_order_vals[] = {
+static const value_string diameter_3gpp_qos_del_order_vals[] = {
     { 0x00, "Subscribed delivery order (MS to net); Reserved (net to MS)" },
     { 0x01, "With delivery order ('yes')" },
     { 0x02, "Without delivery order ('no')" },
@@ -3191,7 +3191,7 @@ const value_string diameter_3gpp_qos_del_order_vals[] = {
     { 0, NULL }
 };
 
-const value_string diameter_3gpp_qos_traffic_cls_vals[] = {
+static const value_string diameter_3gpp_qos_traffic_cls_vals[] = {
     { 0x00, "Subscribed traffic class (MS to net); Reserved (net to MS)" },
     { 0x01, "Conversational class" },
     { 0x02, "Streaming class" },
@@ -3201,7 +3201,7 @@ const value_string diameter_3gpp_qos_traffic_cls_vals[] = {
     { 0, NULL }
 };
 
-const value_string diameter_3gpp_qos_sdu_err_rat_vals[] = {
+static const value_string diameter_3gpp_qos_sdu_err_rat_vals[] = {
     { 0x00, "Subscribed SDU error ratio (MS to net); Reserved (net to MS)" },
     { 0x01, "1E-2" },
     { 0x02, "7E-3" },
@@ -3214,7 +3214,7 @@ const value_string diameter_3gpp_qos_sdu_err_rat_vals[] = {
     { 0, NULL }
 };
 
-const value_string diameter_3gpp_qos_ber_vals[] = {
+static const value_string diameter_3gpp_qos_ber_vals[] = {
     { 0x00, "Subscribed residual BER (MS to net); Reserved (net to MS)" },
     { 0x01, "5E-2" },
     { 0x02, "1E-2" },
@@ -3229,15 +3229,17 @@ const value_string diameter_3gpp_qos_ber_vals[] = {
     { 0, NULL }
 };
 
-const value_string diameter_3gpp_qos_traff_hdl_pri_vals[] = {
+#if 0
+static const value_string diameter_3gpp_qos_traff_hdl_pri_vals[] = {
     { 0x00, "Subscribed traffic handling priority (MS to net); Reserved (net to MS)" },
     { 0x01, "Priority level 1" },
     { 0x02, "Priority level 2" },
     { 0x03, "Priority level 3" },
     { 0, NULL }
 };
+#endif
 
-const true_false_string diameter_3gpp_qos_signalling_ind_value = {
+static const true_false_string diameter_3gpp_qos_signalling_ind_value = {
     "Optimised for signalling traffic",
     "Not optimised for signalling traffic"
 };
diff --git a/epan/dissectors/packet-docsis-macmgmt.c b/epan/dissectors/packet-docsis-macmgmt.c
index 627f6cba57..9592f5fdb4 100644
--- a/epan/dissectors/packet-docsis-macmgmt.c
+++ b/epan/dissectors/packet-docsis-macmgmt.c
@@ -2469,8 +2469,8 @@ static const value_string rba_subband_direction_vals [] = {
 static const true_false_string tfs_ucd_change_ind_vals = {"Changes", "No changes"};
 
 static const true_false_string tfs_allow_inhibit = { "Inhibit Initial Ranging", "Ranging Allowed" };
-const true_false_string type35ucd_tfs_present_not_present = { "UCD35 is present for this UCID",
-                                                              "UCD35 is not present for this UCID" };
+static const true_false_string type35ucd_tfs_present_not_present = { "UCD35 is present for this UCID",
+                                                                     "UCD35 is not present for this UCID" };
 
 static const true_false_string sid_field_bit15_tfs = {
   "The commanded power level P1.6r_n is higher than the value corresponding to the top of the DRW.",
diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c
index eb169905fd..5035fc0824 100644
--- a/epan/dissectors/packet-dof.c
+++ b/epan/dissectors/packet-dof.c
@@ -11823,8 +11823,8 @@ static void dof_oap_handoff(void)
 
 /* SGMP Registration Support */
 
-void dof_register_sgmp_130(void);
-void dof_reg_handoff_sgmp_130(void);
+static void dof_register_sgmp_130(void);
+static void dof_reg_handoff_sgmp_130(void);
 
 static void dof_sgmp_reset(void)
 {
@@ -11834,7 +11834,7 @@ static void dof_sgmp_cleanup(void)
 {
 }
 
-void dof_register_sgmp_130(void)
+static void dof_register_sgmp_130(void)
 {
     static hf_register_info hf[] =
     {
@@ -11897,7 +11897,7 @@ void dof_register_sgmp_130(void)
 /**
  * The registration hand-off routine
  */
-void dof_reg_handoff_sgmp_130(void)
+static void dof_reg_handoff_sgmp_130(void)
 {
     dissector_handle_t sgmp_handle = create_dissector_handle(dissect_sgmp, proto_sgmp);
 
diff --git a/epan/dissectors/packet-dpaux.c b/epan/dissectors/packet-dpaux.c
index 4d4e1c0d0e..fd2797eb49 100644
--- a/epan/dissectors/packet-dpaux.c
+++ b/epan/dissectors/packet-dpaux.c
@@ -126,7 +126,7 @@ struct dpaux_register {
     } data;
 };
 
-struct dpaux_register registers[] = {
+static struct dpaux_register registers[] = {
     { 0x0, DPAUX_REGISTER_TYPE_BITFIELD, .data.bitfield = { &hf_00000, reg00000_fields } },
     { 0x1, DPAUX_REGISTER_TYPE_BITFIELD, .data.bitfield = { &hf_00001, reg00001_fields } },
     { 0x2, DPAUX_REGISTER_TYPE_BITFIELD, .data.bitfield = { &hf_00002, reg00002_fields } },
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 0fa1ff75a4..8a9d0cd61c 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -50,7 +50,7 @@ static int dissect_admin_record(proto_tree *primary_tree, tvbuff_t *tvb, packet_
 extern void
 dissect_amp_as_subtree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset);
 
-int add_sdnv_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, int hf_sdnv_time);
+static int add_sdnv_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, int hf_sdnv_time);
 
 
 /* For Reassembling TCP Convergence Layer segments */
diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c
index 8c1d4d61b9..9b58cc7539 100644
--- a/epan/dissectors/packet-e164.c
+++ b/epan/dissectors/packet-e164.c
@@ -401,7 +401,7 @@ const value_string E164_ISO3166_country_code_short_value[] = {
 };
 value_string_ext E164_ISO3166_country_code_short_value_ext = VALUE_STRING_EXT_INIT(E164_ISO3166_country_code_short_value);
 
-const value_string E164_GMSS_vals[] = {
+static const value_string E164_GMSS_vals[] = {
 	{ 6,	"Iridium Satellite LLC"},
 	{ 7,	"Iridium Satellite LLC"},
 	{ 8,	"Globalstar"},
@@ -409,7 +409,7 @@ const value_string E164_GMSS_vals[] = {
 	{ 0,	NULL }
 };
 
-const value_string E164_International_Networks_882_vals[] = {
+static const value_string E164_International_Networks_882_vals[] = {
 	{ 10,	"Global Office Application"},
 	{ 12,	"HyperStream International (HSI) Data Network"},
 	{ 13,	"EMS Regional Mobile Satellite System"},
@@ -442,7 +442,7 @@ const value_string E164_International_Networks_882_vals[] = {
 };
 static value_string_ext E164_International_Networks_882_vals_ext = VALUE_STRING_EXT_INIT(E164_International_Networks_882_vals);
 
-const value_string E164_International_Networks_883_vals[] = {
+static const value_string E164_International_Networks_883_vals[] = {
 	{ 100,	"MediaLincc Ltd"},
 	{ 110,	"Aicent Inc"},
 	{ 120,	"Telenor Connexion AB"},
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index edc19b858d..12f1794184 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -258,7 +258,7 @@ static const value_string eap_type_vals[] = {
 };
 value_string_ext eap_type_vals_ext = VALUE_STRING_EXT_INIT(eap_type_vals);
 
-const value_string eap_identity_prefix_vals[] = {
+static const value_string eap_identity_prefix_vals[] = {
   { 0x00, "Encrypted IMSI" },
   {  '0', "EAP-AKA Permanent" },
   {  '1', "EAP-SIM Permanent" },
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 3444122a30..af7b270ed6 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -446,7 +446,7 @@ const value_string tighter_cap_level_vals[] = {
     { 0, NULL}
 };
 
-const value_string cs_to_ps_srvcc_geran_to_utra_vals[] = {
+static const value_string cs_to_ps_srvcc_geran_to_utra_vals[] = {
     { 0, "CS to PS SRVCC from GERAN to UMTS FDD and 1.28 Mcps TDD not supported" },
     { 1, "CS to PS SRVCC from GERAN to UMTS FDD supported" },
     { 2, "CS to PS SRVCC from GERAN to UMTS 1.28 Mcps TDD supported" },
@@ -454,7 +454,7 @@ const value_string cs_to_ps_srvcc_geran_to_utra_vals[] = {
     { 0, NULL}
 };
 
-const value_string cs_to_ps_srvcc_geran_to_eutra_vals[] = {
+static const value_string cs_to_ps_srvcc_geran_to_eutra_vals[] = {
     { 0, "CS to PS SRVCC from GERAN to E-UTRA FDD and TDD not supported" },
     { 1, "CS to PS SRVCC from GERAN to E-UTRA FDD supported" },
     { 2, "CS to PS SRVCC from GERAN to E-UTRA TDD supported" },
@@ -3484,7 +3484,7 @@ de_cn_common_gsm_map_nas_sys_info(tvbuff_t *tvb, proto_tree *tree, packet_info *
 /*
  * [3] 10.5.1.12.2 CS domain specific system information
  */
-const true_false_string gsm_a_att_value = {
+static const true_false_string gsm_a_att_value = {
     "MSs shall apply IMSI attach and detach procedure",
     "MSs shall not apply IMSI attach and detach procedure"
 };
@@ -3510,12 +3510,12 @@ de_cs_domain_spec_sys_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
 /*
  * [3] 10.5.1.12.3 PS domain specific system information
  */
-const true_false_string gsm_a_nmo_1_value = {
+static const true_false_string gsm_a_nmo_1_value = {
     "Network Mode of Operation I is used for MS configured for NMO_I_Behaviour",
     "Network Mode of Operation indicated in Bit 1 (NMO) is used for MS configured for NMO_I_Behaviour"
 };
 
-const true_false_string gsm_a_nmo_value = {
+static const true_false_string gsm_a_nmo_value = {
     "Network Mode of Operation II",
     "Network Mode of Operation I"
 };
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index 95b9fee9e0..a89e97de9c 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -4003,7 +4003,7 @@ de_gmm_mac(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs
 }
 
 /* [13] 10.5.5.34 User Plane integrity indicator */
-const true_false_string gsm_a_gm_up_integ_ind_value = {
+static const true_false_string gsm_a_gm_up_integ_ind_value = {
 	"MS shall enable integrity protection of user plane data in LLC layer",
 	"MS shall disable integrity protection of user plane data in LLC layer"
 };