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

Make some symbols static or delete them.

This commit is contained in:
Martin Mathieson 2021-01-25 19:26:17 +00:00 committed by AndersBroman
parent 785e291c1b
commit 619b3128a1
6 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-zbee-aps.c
View File

@ -512,7 +512,7 @@ const range_string zbee_aps_apid_names[] = {
};
/* ZigBee Application Profile ID Abbreviations */
const range_string zbee_aps_apid_abbrs[] = {
static const range_string zbee_aps_apid_abbrs[] = {
{ ZBEE_DEVICE_PROFILE, ZBEE_DEVICE_PROFILE, "ZDP" },
{ ZBEE_PROFILE_IPM, ZBEE_PROFILE_IPM, "IPM" },
{ ZBEE_PROFILE_T1, ZBEE_PROFILE_T1, "T1" },
@ -651,7 +651,7 @@ const range_string zbee_aps_cid_names[] = {
};
/* APS Test Profile #2 Cluster Names */
const value_string zbee_aps_t2_cid_names[] = {
static const value_string zbee_aps_t2_cid_names[] = {
{ ZBEE_APS_T2_CID_BR, "Broadcast Request"},
{ ZBEE_APS_T2_CID_BTADR, "Broadcast to All Devices Response"},
{ ZBEE_APS_T2_CID_BTARACR, "Broadcast to All Routers and Coordinator Response"},
@ -674,7 +674,7 @@ const value_string zbee_aps_t2_cid_names[] = {
};
/* APS Test Profile #2 Buffer Test Response Status Names */
const value_string zbee_aps_t2_btres_status_names[] = {
static const value_string zbee_aps_t2_btres_status_names[] = {
{ ZBEE_APS_T2_CID_BTRES_S_SBT, "Successful Buffer Test"},
{ ZBEE_APS_T2_CID_BTRES_S_TFOFA, "Transmission Failure on First Attempt"},

4
epan/dissectors/packet-zbee-zcl.c
View File

@ -47,6 +47,8 @@ static void zcl_dump_data(tvbuff_t *tvb, guint offset, packet_info *pinfo, prot
static void dissect_zcl_array_type(tvbuff_t *tvb, proto_tree *tree, guint *offset, guint8 elements_type, guint16 elements_num, gboolean client_attr);
static void dissect_zcl_set_type(tvbuff_t *tvb, proto_tree *tree, guint *offset, guint8 elements_type, guint16 elements_num, gboolean client_attr);
static zbee_zcl_cluster_desc *zbee_zcl_get_cluster_desc(guint16 cluster_id, guint16 mfr_code);
/********************
* Global Variables *
********************
@ -2660,7 +2662,7 @@ zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 clu
*@param mfr_code manufacturer code
*@return cluster descriptor pointer
*/
zbee_zcl_cluster_desc
static zbee_zcl_cluster_desc
*zbee_zcl_get_cluster_desc(guint16 cluster_id, guint16 mfr_code)
{
GList *gl;

1
epan/dissectors/packet-zbee-zcl.h
View File

@ -208,7 +208,6 @@ extern void dissect_zcl_attr_data_type_val(tvbuff_t *tvb, proto_tree *tree, guin
extern guint dissect_zcl_attr_uint8 (tvbuff_t *tvb, proto_tree *tree, guint *offset, int *length);
/* Helper functions */
zbee_zcl_cluster_desc *zbee_zcl_get_cluster_desc(guint16 cluster_id, guint16 mfr_code);
/* Exported DLL functions */
WS_DLL_PUBLIC void decode_zcl_time_in_100ms (gchar *s, guint16 value);

20
epan/dissectors/packet-zbee-zdp.c
View File

@ -137,7 +137,6 @@ static int hf_zbee_zdp_complex = -1;
int hf_zbee_zdp_target = -1;
int hf_zbee_zdp_replacement = -1;
int hf_zbee_zdp_replacement_ep = -1;
int hf_zbee_zdp_bind_src = -1;
int hf_zbee_zdp_bind_src64 = -1;
int hf_zbee_zdp_bind_src_ep = -1;
int hf_zbee_zdp_bind_dst = -1;
@ -164,7 +163,6 @@ static int hf_zbee_zdp_complex = -1;
int hf_zbee_zdp_pan_eui64 = -1;
int hf_zbee_zdp_pan_uint = -1;
int hf_zbee_zdp_channel = -1;
int hf_zbee_zdp_nwk_desc_profile = -1;
int hf_zbee_zdp_profile_version = -1;
int hf_zbee_zdp_beacon = -1;
int hf_zbee_zdp_superframe = -1;
@ -223,7 +221,7 @@ static gint ett_zbee_zdp_bind_table = -1;
gint ett_zbee_zdp_cache = -1;
gint ett_zbee_zdp_nwk_desc = -1;
gint ett_zbee_zdp_table_entry = -1;
gint ett_zbee_zdp_descriptor_capability_field = -1;
static gint ett_zbee_zdp_descriptor_capability_field = -1;
/**************************************
* Value Strings
@ -400,7 +398,7 @@ const value_string zbee_zdp_rtg_status_vals[] = {
{ 0, NULL }
};
const value_string zbee_zdp_ieee_join_policy_vals[] = {
static const value_string zbee_zdp_ieee_join_policy_vals[] = {
{ 0x00, "All Join" },
{ 0x01, "IEEE Join" },
{ 0x02, "No Join" },
@ -412,20 +410,20 @@ const value_string zbee_zdp_ieee_join_policy_vals[] = {
than 0x01, and it's intentional that those other values be
"Unknown" (which is what value_string will give us)
*/
const value_string zbee_zdp_true_false_plus_vals[] = {
static const value_string zbee_zdp_true_false_plus_vals[] = {
{ 0x00, "False" },
{ 0x01, "True" },
{ 0, NULL }
};
const value_string zbee_zdp_table_entry_type_vals[] = {
static const value_string zbee_zdp_table_entry_type_vals[] = {
{ 0x00, "Coordinator" },
{ 0x01, "Router" },
{ 0x02, "End Device" },
{ 0, NULL }
};
const value_string zbee_zdp_relationship_vals[] = {
static const value_string zbee_zdp_relationship_vals[] = {
{ 0x00, "Parent" },
{ 0x01, "Child" },
{ 0x02, "Sibling" },
@ -1652,10 +1650,6 @@ void proto_register_zbee_zdp(void)
{ "Replacement Endpoint", "zbee_zdp.replacement_ep", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_zbee_zdp_bind_src,
{ "Source", "zbee_zdp.bind.src", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_zbee_zdp_bind_src64,
{ "Source", "zbee_zdp.bind.src64", FT_EUI64, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
@ -1752,10 +1746,6 @@ void proto_register_zbee_zdp(void)
{ "Channel", "zbee_zdp.channel", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_zbee_zdp_nwk_desc_profile,
{ "Profile", "zbee_zdp.profile", FT_UINT16, BASE_HEX, NULL, 0x0F,
NULL, HFILL }},
{ &hf_zbee_zdp_profile_version,
{ "Version", "zbee_zdp.profile_version", FT_UINT8, BASE_DEC, NULL, 0xF0,
NULL, HFILL }},

2
epan/dissectors/packet-zbee-zdp.h
View File

@ -234,7 +234,6 @@ extern int hf_zbee_zdp_simple_length;
extern int hf_zbee_zdp_target;
extern int hf_zbee_zdp_replacement;
extern int hf_zbee_zdp_replacement_ep;
extern int hf_zbee_zdp_bind_src;
extern int hf_zbee_zdp_bind_src64;
extern int hf_zbee_zdp_bind_src_ep;
extern int hf_zbee_zdp_bind_dst;
@ -261,7 +260,6 @@ extern int hf_zbee_zdp_channel_energy;
extern int hf_zbee_zdp_pan_eui64;
extern int hf_zbee_zdp_pan_uint;
extern int hf_zbee_zdp_channel;
extern int hf_zbee_zdp_nwk_desc_profile;
extern int hf_zbee_zdp_profile_version;
extern int hf_zbee_zdp_beacon;
extern int hf_zbee_zdp_superframe;

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

@ -164,7 +164,7 @@ typedef struct _value_string_keyval {
} value_string_keyval;
const value_zrtp_versions valid_zrtp_versions[] =
static const value_zrtp_versions valid_zrtp_versions[] =
{
{"1.1x"},
{"1.0x"},
@ -174,7 +174,7 @@ const value_zrtp_versions valid_zrtp_versions[] =
{NULL}
};
const value_string_keyval zrtp_hash_type_vals[] =
static const value_string_keyval zrtp_hash_type_vals[] =
{
{ "S256", "SHA-256 Hash"},
{ "S384", "SHA-384 Hash"},
@ -183,7 +183,7 @@ const value_string_keyval zrtp_hash_type_vals[] =
{ NULL, NULL }
};
const value_string_keyval zrtp_cipher_type_vals[] =
static const value_string_keyval zrtp_cipher_type_vals[] =
{
{ "AES1", "AES-CM with 128 bit keys"},
{ "AES2", "AES-CM with 192 bit keys"},
@ -197,7 +197,7 @@ const value_string_keyval zrtp_cipher_type_vals[] =
{ NULL, NULL }
};
const value_string_keyval zrtp_auth_tag_vals[] =
static const value_string_keyval zrtp_auth_tag_vals[] =
{
{ "HS32", "HMAC-SHA1 32 bit authentication tag"},
{ "HS80", "HMAC-SHA1 80 bit authentication tag"},
@ -206,14 +206,14 @@ const value_string_keyval zrtp_auth_tag_vals[] =
{ NULL, NULL }
};
const value_string_keyval zrtp_sas_type_vals[] =
static const value_string_keyval zrtp_sas_type_vals[] =
{
{ "B32 ", "Short authentication string using base 32"},
{ "B256", "Short authentication string using base 256"},
{ NULL, NULL }
};
const value_string_keyval zrtp_key_agreement_vals[] =
static const value_string_keyval zrtp_key_agreement_vals[] =
{
{ "DH2k", "DH mode with p=2048 bit prime"},
{ "DH3k", "DH mode with p=3072 bit prime"},
@ -226,7 +226,7 @@ const value_string_keyval zrtp_key_agreement_vals[] =
{ NULL, NULL }
};
const value_string zrtp_error_vals[] =
static const value_string zrtp_error_vals[] =
{
{ ZRTP_ERR_10, "Malformed Packet (CRC OK but wrong structure)"},
{ ZRTP_ERR_20, "Critical Software Error"},