forked from osmocom/wireshark
Revert "Fix warning: no previous prototype for ... [-Wmissing-prototypes]"
This reverts commit 9918435ed7
.
Change-Id: I122b65ec59f48b8a21e2b43ccdad0ed146b0e78f
Reviewed-on: https://code.wireshark.org/review/3702
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
9918435ed7
commit
3788097ac8
|
@ -48,7 +48,6 @@
|
|||
|
||||
void proto_register_mac_header_generic(void);
|
||||
void proto_reg_handoff_mac_header_generic(void);
|
||||
void wimax_defragment_init(void);
|
||||
|
||||
extern gint proto_wimax;
|
||||
|
||||
|
|
|
@ -207,7 +207,7 @@ static const value_string last_msgs[] =
|
|||
{ 0, NULL}
|
||||
};
|
||||
|
||||
static void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
gint tvb_len, offset = 0;
|
||||
guint first_byte, sub_type;
|
||||
|
|
|
@ -380,7 +380,7 @@ static const value_string ai_msgs[] =
|
|||
};
|
||||
|
||||
|
||||
static void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
gint tvb_len, offset = 0;
|
||||
guint cii_bit, first_byte, fb_type, mimo_type;
|
||||
|
|
|
@ -95,7 +95,7 @@ static int hf_aas_fbck_rssi_value = -1;
|
|||
static int hf_aas_fbck_cinr_value = -1;
|
||||
|
||||
|
||||
static void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
||||
void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
||||
{
|
||||
guint offset = 0;
|
||||
guint data_type;
|
||||
|
@ -135,7 +135,7 @@ static void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info
|
|||
}
|
||||
}
|
||||
|
||||
static void dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
||||
void dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
||||
{
|
||||
guint offset = 0;
|
||||
guint tvb_len, data_type;
|
||||
|
|
|
@ -36,10 +36,6 @@
|
|||
|
||||
extern gboolean include_cor2_changes;
|
||||
|
||||
extern gboolean is_down_link(packet_info *pinfo);
|
||||
extern gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree);
|
||||
extern gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdu_tree);
|
||||
|
||||
void proto_register_mac_mgmt_msg_dlmap(void);
|
||||
void proto_reg_handoff_mac_mgmt_msg_dlmap(void);
|
||||
|
||||
|
@ -321,7 +317,7 @@ static gint hf_mac_header_compress_dlmap_crc = -1;
|
|||
* DL-MAP Miscellaneous IEs and TLVs
|
||||
*******************************************************************/
|
||||
|
||||
static gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type_lcl)
|
||||
gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type_lcl)
|
||||
{
|
||||
/* RCID_IE 8.4.5.3 and 8.4.5.3.20.1 */
|
||||
/* offset of IE in bits, length is variable */
|
||||
|
@ -2170,8 +2166,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
|
|||
extern gint dissect_ulmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb);
|
||||
extern gint wimax_decode_ulmap_reduced_aas(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb);
|
||||
|
||||
#if 0
|
||||
static gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree)
|
||||
gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree)
|
||||
{
|
||||
/* decode a SUB-DL-UL-MAP message 6.3.2.3.60 and return the length in bytes */
|
||||
/* first three bits are 0x7, which following a compressed DL map indicates this message */
|
||||
|
@ -2252,7 +2247,6 @@ static gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, pr
|
|||
/* return length */
|
||||
return length;
|
||||
}
|
||||
#endif
|
||||
|
||||
gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree)
|
||||
{
|
||||
|
|
|
@ -100,7 +100,7 @@ static void dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pin
|
|||
}
|
||||
}
|
||||
|
||||
static void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
guint offset = 0;
|
||||
proto_item *dsc_item;
|
||||
|
|
|
@ -220,7 +220,7 @@ static const value_string tfs_support[] = {
|
|||
};
|
||||
|
||||
/* Decode REG-REQ sub-TLV's. */
|
||||
static void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb, guint tlv_offset, guint tlv_len, packet_info *pinfo, guint offset, gint proto_registry)
|
||||
void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb, guint tlv_offset, guint tlv_len, packet_info *pinfo, guint offset, gint proto_registry)
|
||||
{
|
||||
proto_item *tlv_item;
|
||||
proto_tree *tlv_tree;
|
||||
|
|
|
@ -124,7 +124,7 @@ static const true_false_string tfs_rng_timing_adj = {
|
|||
};
|
||||
|
||||
/* Decode RNG Power Saving Class parameters (Sub TLV's). */
|
||||
static void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_t *tvb, guint compound_tlv_len, packet_info *pinfo, guint offset)
|
||||
void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_t *tvb, guint compound_tlv_len, packet_info *pinfo, guint offset)
|
||||
{
|
||||
proto_item *tlv_item;
|
||||
proto_tree *tlv_tree;
|
||||
|
|
|
@ -35,9 +35,6 @@
|
|||
#include "wimax_bits.h"
|
||||
|
||||
extern gboolean include_cor2_changes;
|
||||
extern void init_wimax_globals(void);
|
||||
extern gint wimax_decode_ulmapc(proto_tree *base_tree, gint offset, gint length, tvbuff_t *tvb);
|
||||
extern gint wimax_decode_ulmap_reduced_aas(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb);
|
||||
|
||||
void proto_register_mac_mgmt_msg_ulmap(void);
|
||||
void proto_reg_handoff_mac_mgmt_msg_ulmap(void);
|
||||
|
@ -1519,7 +1516,7 @@ static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length,
|
|||
* UL-MAP Miscellany
|
||||
*******************************************************************/
|
||||
|
||||
static gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff_t *tvb)
|
||||
gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff_t *tvb)
|
||||
{
|
||||
/* decode a single UL-MAP IE and return the
|
||||
* length of the IE in nibbles
|
||||
|
|
Loading…
Reference in New Issue