osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make more functions and vars static.

This commit is contained in:
Martin Mathieson 2021-02-05 12:07:29 +00:00 committed by Wireshark GitLab Utility
parent cefc4e183d
commit 597a5df1a7
9 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-lisp.c
View File

@ -420,7 +420,7 @@ static dissector_handle_t ipv6_handle;
static gboolean encapsulated = FALSE;
static gboolean ddt_originated = FALSE;
const value_string lisp_typevals[] = {
static const value_string lisp_typevals[] = {
{ LISP_MAP_REQUEST, "Map-Request" },
{ LISP_MAP_REPLY, "Map-Reply" },
{ LISP_MAP_REGISTER, "Map-Register" },
@ -431,7 +431,7 @@ const value_string lisp_typevals[] = {
{ 0, NULL}
};
const value_string mapping_actions[] = {
static const value_string mapping_actions[] = {
{ LISP_ACT_NONE, "No-Action" },
{ LISP_ACT_FWD_NATIVE, "Natively-Forward" },
{ LISP_ACT_MREQ, "Send-Map-Request" },
@ -442,7 +442,7 @@ const value_string mapping_actions[] = {
{ 0, NULL}
};
const value_string referral_actions[] = {
static const value_string referral_actions[] = {
{ DDT_NODE_REF, "Node Referral" },
{ DDT_MS_REF, "Map-Server Referral" },
{ DDT_MS_ACK, "Map-Server ACK" },
@ -452,7 +452,7 @@ const value_string referral_actions[] = {
{ 0, NULL}
};
const value_string lcaf_typevals[] = {
static const value_string lcaf_typevals[] = {
{ LCAF_NULL, "Null Body" },
{ LCAF_AFI_LIST, "AFI List" },
{ LCAF_IID, "Instance ID" },
@ -473,20 +473,20 @@ const value_string lcaf_typevals[] = {
{ 0, NULL}
};
const value_string lat_typevals[] = {
static const value_string lat_typevals[] = {
{ 0, "S" },
{ 1, "N" },
{ 0, NULL}
};
const value_string lon_typevals[] = {
static const value_string lon_typevals[] = {
{ 0, "W" },
{ 1, "E" },
{ 0, NULL}
};
/* Add your company OUI here if you're developing a vendor LCAF dissector */
const value_string oui_vals[] = {
static const value_string oui_vals[] = {
{ OUI_CISCO, "Cisco" },
{ 0, NULL}
};

6
epan/dissectors/packet-llrp.c
View File

@ -936,9 +936,9 @@ static const value_string status_code[] = {
static value_string_ext status_code_ext = VALUE_STRING_EXT_INIT(status_code);
/* C1G2 tag inventory state aware singulation action */
const true_false_string tfs_state_a_b = { "State B", "State A" };
const true_false_string tfs_sl = { "~SL", "SL" };
const true_false_string tfs_all_no = { "All", "No" };
static const true_false_string tfs_state_a_b = { "State B", "State A" };
static const true_false_string tfs_sl = { "~SL", "SL" };
static const true_false_string tfs_all_no = { "All", "No" };
/* Vendors */
#define LLRP_VENDOR_IMPINJ 25882

2
epan/dissectors/packet-lltd.c
View File

@ -304,7 +304,7 @@ static const value_string lltd_qos_error_vals[] = {
};
const true_false_string tfs_full_half_duplex = { "Full Duplex", "Half Duplex" };
static const true_false_string tfs_full_half_duplex = { "Full Duplex", "Half Duplex" };
static int

2
epan/dissectors/packet-log3gpp.c
View File

@ -92,7 +92,7 @@ typedef struct
the purpose is to match a protocol name with a dissector,
and to store the dissector handle the first time to avoid looking it up every time.
This table should contain all 3GPP specified protocols */
lookup_dissector_element_t dissector_lookup_table[] = {
static lookup_dissector_element_t dissector_lookup_table[] = {
{"DATA","data","data",0,0,NULL},
{"GAN.TCP","umatcp","umatcp",0,0,NULL},
{"GAN.UDP","umaudp","umaudp",0,0,NULL},

8
epan/dissectors/packet-lustre.c
View File

@ -1011,7 +1011,7 @@ VALUE_STRING_ARRAY2(lustre_op_codes);
VALUE_STRING_ENUM(lustre_LMTypes);
VALUE_STRING_ARRAY(lustre_LMTypes);
const true_false_string lnet_flags_set_truth = { "Set", "Unset" };
static const true_false_string lnet_flags_set_truth = { "Set", "Unset" };
#define lustre_layout_intent_opc_vals_VALUE_STRING_LIST(XXX) \
XXX(LAYOUT_INTENT_ACCESS, 0, "ACCESS") \
@ -1202,7 +1202,8 @@ VALUE_STRING_ARRAY2(lustre_barrier_status_vals);
#define LDLM_FL_RESENT 0x0100000000000000ULL
#define LDLM_FL_COS_ENABLED 0x0200000000000000ULL
const value_string lustre_ldlm_flags_vals[] = {
#if 0
static const value_string lustre_ldlm_flags_vals[] = {
{LDLM_FL_LOCK_CHANGED, "LDLM_FL_LOCK_CHANGED"},
{LDLM_FL_BLOCK_GRANTED, "LDLM_FL_BLOCK_GRANTED"},
{LDLM_FL_BLOCK_CONV, "LDLM_FL_BLOCK_CONV"},
@ -1222,6 +1223,7 @@ const value_string lustre_ldlm_flags_vals[] = {
{LDLM_FL_AST_DISCARD_DATA, "LDLM_FL_AST_DISCARD_DATA"},
{ 0, NULL }
};
#endif
/********************************************************************
*
@ -1480,7 +1482,7 @@ VALUE_STRING_ARRAY(fld_op_vals);
#define UPDATE_REQUEST_MAGIC_V1 0xBDDE0001
#define UPDATE_REQUEST_MAGIC_V2 0xBDDE0002
const value_string update_request_magic_vals[] = {
static const value_string update_request_magic_vals[] = {
{UPDATE_REQUEST_MAGIC_V1, "UPDATE_REQUEST_MAGIC_V1"},
{UPDATE_REQUEST_MAGIC_V2, "UPDATE_REQUEST_MAGIC_V2"},
{0, NULL}

2
epan/dissectors/packet-mausb.c
View File

@ -534,7 +534,7 @@ static const value_string mausb_transfer_type_string[] = {
{ 0, NULL}
};
const true_false_string tfs_ep_handle_resp_dir = { "IN", "OUT or Control" };
static const true_false_string tfs_ep_handle_resp_dir = { "IN", "OUT or Control" };
#define MAUSB_TRANSFER_TYPE_OFFSET 3 /* Offset from start of TFlags Field */
/* (EPS not included) */

8
epan/dissectors/packet-mpls-echo.c
View File

@ -448,7 +448,7 @@ static const value_string mpls_echo_multipathtlv_type[] = {
#define SUB_TLV_FEC_PUSH 1
#define SUB_TLV_FEC_POP 2
const value_string mpls_echo_subtlv_op_types[] = {
static const value_string mpls_echo_subtlv_op_types[] = {
{ SUB_TLV_FEC_PUSH, "Push"},
{ SUB_TLV_FEC_POP, "Pop"},
{ 0, NULL}
@ -459,7 +459,7 @@ const value_string mpls_echo_subtlv_op_types[] = {
#define SUB_TLV_FEC_IPV4 1
#define SUB_TLV_FEC_IPV6 2
const value_string mpls_echo_subtlv_addr_types[] = {
static const value_string mpls_echo_subtlv_addr_types[] = {
{ SUB_TLV_FEC_UNSPECIFIED, "Unspecified"},
{ SUB_TLV_FEC_IPV4, "IPv4"},
{ SUB_TLV_FEC_IPV6, "IPv6"},
@ -471,7 +471,7 @@ const value_string mpls_echo_subtlv_addr_types[] = {
#define SUB_TLV_FEC_SR_PROTO_OSPF 1
#define SUB_TLV_FEC_SR_PROTO_ISIS 2
const value_string mpls_echo_subtlv_sr_protocol_types[] = {
static const value_string mpls_echo_subtlv_sr_protocol_types[] = {
{ SUB_TLV_FEC_SR_PROTO_ANY, "Any IGP protocol"},
{ SUB_TLV_FEC_SR_PROTO_OSPF, "OSPF"},
{ SUB_TLV_FEC_SR_PROTO_ISIS, "IS-IS"},
@ -484,7 +484,7 @@ const value_string mpls_echo_subtlv_sr_protocol_types[] = {
#define SUB_TLV_FEC_SR_IGP_ADJ_IPv4 4
#define SUB_TLV_FEC_SR_IGP_ADJ_IPv6 6
const value_string mpls_echo_subtlv_igp_adjacency_types[] = {
static const value_string mpls_echo_subtlv_igp_adjacency_types[] = {
{ SUB_TLV_FEC_SR_IGP_ADJ_UNNUMBERED, "Unnumbered Interface Adjacency"},
{ SUB_TLV_FEC_SR_IGP_ADJ_PARALLEL, "Parallel Adjacency"},
{ SUB_TLV_FEC_SR_IGP_ADJ_IPv4, "IPv4, Non-parallel Adjacency"},

6
epan/dissectors/packet-mpls-pm.c
View File

@ -111,7 +111,7 @@ static int hf_mpls_pm_timestamp4_unk = -1;
* http://www.iana.org/assignments/mpls-lsp-ping-parameters
* Registry Name: 'Loss/Delay Measurement Control Code: Query Codes'
*/
const range_string mpls_pm_query_ctrl_code_rvals[] = {
static const range_string mpls_pm_query_ctrl_code_rvals[] = {
{ 0x00, 0x00, "In-band Response Requested" },
{ 0x01, 0x01, "Out-of-band Response Requested" },
{ 0x02, 0x02, "No Response Requested" },
@ -124,7 +124,7 @@ const range_string mpls_pm_query_ctrl_code_rvals[] = {
* http://www.iana.org/assignments/mpls-lsp-ping-parameters
* Registry Name: 'Loss/Delay Measurement Control Code: Response Codes'
*/
const range_string mpls_pm_response_ctrl_code_rvals[] = {
static const range_string mpls_pm_response_ctrl_code_rvals[] = {
{ 0x00, 0x00, "Reserved" },
{ 0x01, 0x01, "Success" },
{ 0x02, 0x02, "Data Format Invalid" },
@ -174,7 +174,7 @@ static const value_string pmt_vals[] = {
#define MPLS_PM_TSF_SEQ 1
#define MPLS_PM_TSF_NTP 2
#define MPLS_PM_TSF_PTP 3
const range_string mpls_pm_time_stamp_format_rvals[] = {
static const range_string mpls_pm_time_stamp_format_rvals[] = {
{ MPLS_PM_TSF_NULL, MPLS_PM_TSF_NULL,
"Null Timestamp" },
{ MPLS_PM_TSF_SEQ, MPLS_PM_TSF_SEQ,

12
epan/dissectors/packet-mpls-psc.c
View File

@ -39,7 +39,7 @@ static int hf_mpls_psc_tlvlen = -1;
* http://www.iana.org/assignments/mpls-oam-parameters/mpls-oam-parameters.xml
* Registry Name: 'MPLS PSC Request'
*/
const range_string mpls_psc_req_rvals[] = {
static const range_string mpls_psc_req_rvals[] = {
{ 0, 0, "No Request" },
{ 1, 1, "Do Not Revert" },
{ 2, 3, "Unassigned" },
@ -57,7 +57,7 @@ const range_string mpls_psc_req_rvals[] = {
{ 0, 0, NULL }
};
const value_string mpls_psc_req_short_vals[] = {
static const value_string mpls_psc_req_short_vals[] = {
{ 0, "NR" },
{ 1, "DNR" },
{ 4, "WTR" },
@ -69,7 +69,7 @@ const value_string mpls_psc_req_short_vals[] = {
{ 0, NULL }
};
const range_string mpls_psc_pt_rvals[] = {
static const range_string mpls_psc_pt_rvals[] = {
{ 0, 0, "for future extensions" },
{ 1, 1, "unidirectional switching using a permanent bridge" },
{ 2, 2, "bidirectional switching using a selector bridge" },
@ -77,20 +77,20 @@ const range_string mpls_psc_pt_rvals[] = {
{ 0, 0, NULL }
};
const range_string mpls_psc_rev_rvals[] = {
static const range_string mpls_psc_rev_rvals[] = {
{ 0, 0, "non-revertive mode" },
{ 1, 1, "revertive mode" },
{ 0, 0, NULL }
};
const range_string mpls_psc_fpath_rvals[] = {
static const range_string mpls_psc_fpath_rvals[] = {
{ 0, 0, "protection" },
{ 1, 1, "working" },
{ 2, 255, "for future extensions" },
{ 0, 0, NULL }
};
const range_string mpls_psc_dpath_rvals[] = {
static const range_string mpls_psc_dpath_rvals[] = {
{ 0, 0, "protection is not in use" },
{ 1, 1, "protection is in use" },
{ 2, 255, "for future extensions" },