aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mathieson <martin.mathieson@keysight.com>2021-02-08 13:05:27 +0000
committerMartin Mathieson <martin.mathieson@keysight.com>2021-02-08 13:05:27 +0000
commit251092b0058feebb366b49b06d62108f7f0811a9 (patch)
tree381eb82706baf4dfa454653eb8bef232e890d4a1
parentb35befb81853e07440e39dec28f5746666748feb (diff)
Make more functions and vars static.
-rw-r--r--epan/dissectors/packet-ieee1905.c2
-rw-r--r--epan/dissectors/packet-ieee8021ah.c6
-rw-r--r--epan/dissectors/packet-ippusb.c8
-rw-r--r--epan/dissectors/packet-ipv6.c2
-rw-r--r--epan/dissectors/packet-isi.c2
-rw-r--r--epan/dissectors/packet-isup.c10
-rw-r--r--epan/dissectors/packet-lisp-tcp.c8
7 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index 0f4c5e6b09..74331ee0df 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -8410,7 +8410,7 @@ ieee1905_fragment_free_persistent_key(gpointer ptr)
static reassembly_table g_ieee1905_reassembly_table;
-const reassembly_table_functions ieee1905_reassembly_table_functions = {
+static reassembly_table_functions ieee1905_reassembly_table_functions = {
ieee1905_fragment_hash,
ieee1905_fragment_equal,
ieee1905_fragment_temporary_key,
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 0258d45010..204eee34e4 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -28,8 +28,8 @@ static dissector_handle_t ethertype_handle;
static capture_dissector_handle_t ipx_cap_handle;
static capture_dissector_handle_t llc_cap_handle;
-void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_tree *parent, int tree_index);
+static void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo,
+ proto_tree *tree, proto_tree *parent, int tree_index);
/* GLOBALS ************************************************************/
@@ -216,7 +216,7 @@ int dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo,
return tvb_captured_length(tvb);
}
-void
+static void
dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, proto_tree *parent, int tree_index) {
guint32 tci;
diff --git a/epan/dissectors/packet-ippusb.c b/epan/dissectors/packet-ippusb.c
index d4aa8a6696..eb803f5a19 100644
--- a/epan/dissectors/packet-ippusb.c
+++ b/epan/dissectors/packet-ippusb.c
@@ -110,7 +110,7 @@ struct ippusb_multisegment_pdu {
#define MSP_FLAGS_MISSING_FIRST_SEGMENT 0x00000004
};
-struct ippusb_multisegment_pdu *
+static struct ippusb_multisegment_pdu *
pdu_store(packet_info *pinfo, wmem_tree_t *multisegment_pdus, guint32 first_frame, gboolean is_ipp, guint document)
{
struct ippusb_multisegment_pdu *msp;
@@ -143,7 +143,7 @@ init_ippusb_conversation_data(void)
return ippusbd;
}
-struct ippusb_analysis *
+static struct ippusb_analysis *
get_ippusb_conversation_data(conversation_t *conv, packet_info *pinfo)
{
struct ippusb_analysis *ippusbd;
@@ -177,7 +177,7 @@ static void ippusb_free_temporary_key(gpointer ptr _U_) { }
static void ippusb_free_persistent_key(gpointer ptr _U_) { }
-reassembly_table_functions ippusb_reassembly_table_functions =
+static reassembly_table_functions ippusb_reassembly_table_functions =
{
g_direct_hash,
g_direct_equal,
@@ -554,4 +554,4 @@ proto_reg_handoff_ippusb(void)
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
- */ \ No newline at end of file
+ */
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 972434f0f2..0ccc47e71b 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -578,7 +578,7 @@ static const value_string ipv6_opt_type_vals[] = {
{ IP6OPT_EXP_FE, "Experimental (0xFE)" },
{ 0, NULL }
};
-value_string_ext ipv6_opt_type_vals_ext = VALUE_STRING_EXT_INIT(ipv6_opt_type_vals);
+static value_string_ext ipv6_opt_type_vals_ext = VALUE_STRING_EXT_INIT(ipv6_opt_type_vals);
static const value_string ipv6_opt_rtalert_vals[] = {
{ IP6OPT_RTALERT_MLD, "MLD" },
diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c
index 41eb458736..f0f2b5d664 100644
--- a/epan/dissectors/packet-isi.c
+++ b/epan/dissectors/packet-isi.c
@@ -213,7 +213,7 @@ static const value_string isi_sim_cause[] = {
{0x00, NULL }
};
-value_string_ext isi_sim_cause_ext = VALUE_STRING_EXT_INIT(isi_sim_cause);
+static value_string_ext isi_sim_cause_ext = VALUE_STRING_EXT_INIT(isi_sim_cause);
static const value_string isi_sim_pb_subblock[] = {
{0xE4, "SIM_PB_INFO_REQUEST"},
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 0ba7acfdf5..25a265a31b 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -800,7 +800,7 @@ static const value_string french_isup_message_type_value_acro[] = {
{ FRENCH_CHARGING_PULSE, "CHP"},
{ FRENCH_CHARGING_ACK, "CHA"},
{ 0, NULL}};
-value_string_ext french_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(french_isup_message_type_value_acro);
+static value_string_ext french_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(french_isup_message_type_value_acro);
static const value_string israeli_isup_message_type_value_acro[] = {
{ MESSAGE_TYPE_INITIAL_ADDR, "IAM"},
@@ -887,7 +887,7 @@ static const value_string israeli_isup_message_type_value_acro[] = {
{ ISRAELI_TRAFFIC_CHANGE, "TCM"},
{ ISRAELI_CHARGE_ACK, "CAM"},
{ 0, NULL}};
-value_string_ext israeli_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(israeli_isup_message_type_value_acro);
+static value_string_ext israeli_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(israeli_isup_message_type_value_acro);
/* Same as above but in acronym form (for the Info column) */
static const value_string russian_isup_message_type_value_acro[] = {
@@ -974,7 +974,7 @@ static const value_string russian_isup_message_type_value_acro[] = {
{ RUSSIAN_CLEAR_CALLING_LINE, "CCL"}, /* 252 */
{ RUSSIAN_RINGING, "RNG"}, /* 255 */
{ 0, NULL}};
-value_string_ext russian_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(russian_isup_message_type_value_acro);
+static value_string_ext russian_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(russian_isup_message_type_value_acro);
static const value_string japan_isup_message_type_value_acro[] = {
{ MESSAGE_TYPE_INITIAL_ADDR, "IAM"},
@@ -1059,7 +1059,7 @@ static const value_string japan_isup_message_type_value_acro[] = {
{ MESSAGE_TYPE_SUBSEQUENT_DIR_NUM, "SDN"},
{ MESSAGE_TYPE_JAPAN_CHARG_INF, "CHG"}, /* 254 */
{ 0, NULL}};
-value_string_ext japan_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(japan_isup_message_type_value_acro);
+static value_string_ext japan_isup_message_type_value_acro_ext = VALUE_STRING_EXT_INIT(japan_isup_message_type_value_acro);
/* Same as above but in acronym form (for the Info column) */
static const value_string ansi_isup_message_type_value_acro[] = {
@@ -1833,7 +1833,7 @@ static const value_string russian_isup_calling_partys_category_value[] = {
{ 0xf7, "Semiautomatic call of category IV"},
{ 0, NULL}};
-value_string_ext russian_isup_calling_partys_category_value_ext = VALUE_STRING_EXT_INIT(russian_isup_calling_partys_category_value);
+static value_string_ext russian_isup_calling_partys_category_value_ext = VALUE_STRING_EXT_INIT(russian_isup_calling_partys_category_value);
#define CVR_RSP_IND_FAILURE 0
#define CVR_RSP_IND_SUCCESS 1
diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c
index 23e890d744..40f4c6fe67 100644
--- a/epan/dissectors/packet-lisp-tcp.c
+++ b/epan/dissectors/packet-lisp-tcp.c
@@ -89,7 +89,7 @@ static expert_field ei_lisp_tcp_unexpected_afi = EI_INIT;
static dissector_handle_t lisp_tcp_handle;
-const value_string lisp_tcp_typevals[] = {
+static const value_string lisp_tcp_typevals[] = {
{ TRANSPORT_BASE, "Error Notification" },
{ TRANSPORT_BASE + 1, "Registration" },
{ TRANSPORT_BASE + 2, "Registration ACK" },
@@ -108,7 +108,7 @@ const value_string lisp_tcp_typevals[] = {
{ 0, NULL}
};
-const value_string lisp_tcp_membership_subscribe_errors[] = {
+static const value_string lisp_tcp_membership_subscribe_errors[] = {
{ 0, "Undefined" },
{ 1, "Instance not found" },
{ 2, "Distribution not enabled" },
@@ -116,7 +116,7 @@ const value_string lisp_tcp_membership_subscribe_errors[] = {
{ 0, NULL}
};
-const value_string lisp_tcp_registration_reject_reason[] = {
+static const value_string lisp_tcp_registration_reject_reason[] = {
{ 1, "Not a valid site EID prefix" },
{ 2, "Authentication failure" },
{ 3, "Locator set not allowed" },
@@ -124,7 +124,7 @@ const value_string lisp_tcp_registration_reject_reason[] = {
{ 0, NULL}
};
-const value_string lisp_tcp_registration_refresh_scope[] = {
+static const value_string lisp_tcp_registration_refresh_scope[] = {
{ 0, "All prefixes under all address families under all EID instances" },
{ 1, "All prefixes under all address families under a single EID instance" },
{ 2, "All prefixes under a single address family under a single EID instance" },