diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2020-09-09 06:06:29 +0000 |
---|---|---|
committer | AndersBroman <a.broman58@gmail.com> | 2020-09-09 06:06:29 +0000 |
commit | a4319f3254db6c53fe925c400a6d316cf326d7f5 (patch) | |
tree | 0a3a57f166a1a4a34c2be4e728f554ff4ae0d08f /epan | |
parent | 6a08695e3ef04e9f3f9949799820123d148065f7 (diff) |
ieee80211: fix Wmissing-prototypes
no previous prototype for function 'add_ff_action_public_fields' [-Wmissing-prototypes]
Change-Id: I8be64454a21187cf60a04c903acfbb18f2a12095
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-enip.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee1905.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-kafka.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-rtps.c | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 8b97cd0b26..bfe335bec6 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1110,6 +1110,7 @@ static enip_conv_info_t* create_connection_id_list(conversation_t* conversation) return enip_info; } +static enip_conv_info_t* get_conversation_info_one_direction(packet_info* pinfo, address* src_address, address* dst_address, cip_connID_info_t* connid_info) { /* default some information if not included */ diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c index e753c64f53..1ee7764469 100644 --- a/epan/dissectors/packet-ieee1905.c +++ b/epan/dissectors/packet-ieee1905.c @@ -7374,8 +7374,9 @@ dissect_akm_suite_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a 1905 Encap DPP TLV: */ -guint -add_ff_action(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset); +int +dissect_wifi_dpp_public_action(tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree, void *data _U_); static const true_false_string tfs_dpp_frame_indicator = { "GAS frame", diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index d6db634fa4..e937399731 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -13347,7 +13347,7 @@ add_ff_action_dmg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offse return offset - start; } -static guint +guint add_ff_action(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, association_sanity_check_t *association_sanity_check) { diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h index a1e0c9b1fd..be929fb31e 100644 --- a/epan/dissectors/packet-ieee80211.h +++ b/epan/dissectors/packet-ieee80211.h @@ -515,6 +515,10 @@ typedef struct anqp_info_dissector_data { extern const value_string ie_tag_num_vals[]; +guint +add_ff_action(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, + association_sanity_check_t *association_sanity_check ); + /* * Editor modelines * diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index e7466e08f3..ecbd9f492c 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -9306,7 +9306,7 @@ compute_kafka_api_names(void) kafka_api_names[len].strptr = NULL; } -void +static void proto_register_kafka_protocol_fields(int protocol) { static hf_register_info hf[] = { @@ -10109,7 +10109,7 @@ proto_register_kafka_protocol_fields(int protocol) } -void +static void proto_register_kafka_protocol_subtrees(const int proto _U_) { static int *ett[] = { @@ -10178,7 +10178,7 @@ proto_register_kafka_protocol_subtrees(const int proto _U_) proto_register_subtree_array(ett, array_length(ett)); } -void +static void proto_register_kafka_expert_module(const int proto) { expert_module_t* expert_kafka; static ei_register_info ei[] = { @@ -10209,7 +10209,7 @@ proto_register_kafka_expert_module(const int proto) { expert_register_field_array(expert_kafka, ei, array_length(ei)); } -void +static void proto_register_kafka_preferences(const int proto) { module_t *kafka_module; diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 5bbc788558..38b0e2951c 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -4546,7 +4546,7 @@ static gboolean compare_by_guid(gconstpointer a, gconstpointer b) { return memcmp(guid_a, guid_b, sizeof(endpoint_guid)) == 0; } -guint get_domain_id_from_tcp_discovered_participants(wmem_map_t *map, endpoint_guid* key) { +static guint get_domain_id_from_tcp_discovered_participants(wmem_map_t *map, endpoint_guid* key) { participant_info *p_info = (participant_info*)wmem_map_lookup(map, (void*)key); return (p_info != NULL) ? p_info->domainId: RTPS_UNKNOWN_DOMAIN_ID_VAL; } |