diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /plugins/epan/wimax/wimax_phy_attributes_decoder.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plugins/epan/wimax/wimax_phy_attributes_decoder.c')
| -rw-r--r-- | plugins/epan/wimax/wimax_phy_attributes_decoder.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/plugins/epan/wimax/wimax_phy_attributes_decoder.c b/plugins/epan/wimax/wimax_phy_attributes_decoder.c index 25572401..646040d3 100644 --- a/plugins/epan/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/epan/wimax/wimax_phy_attributes_decoder.c @@ -19,10 +19,10 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_wimax; +extern int proto_wimax; -static gint proto_wimax_phy_attributes_decoder = -1; -static gint ett_wimax_phy_attributes_decoder = -1; +static int proto_wimax_phy_attributes_decoder; +static int ett_wimax_phy_attributes_decoder; static const value_string vals_subchannel_types[] = { @@ -53,22 +53,22 @@ static const value_string vals_encoding_types[] = {0, NULL} }; -static gint hf_phy_attributes_subchannelization_type = -1; -static gint hf_phy_attributes_permbase = -1; -static gint hf_phy_attributes_modulation_rate = -1; -static gint hf_phy_attributes_encoding_type = -1; -static gint hf_phy_attributes_num_repeat = -1; -static gint hf_phy_attributes_symbol_offset = -1; -static gint hf_phy_attributes_num_of_slots = -1; -static gint hf_phy_attributes_subchannel = -1; +static int hf_phy_attributes_subchannelization_type; +static int hf_phy_attributes_permbase; +static int hf_phy_attributes_modulation_rate; +static int hf_phy_attributes_encoding_type; +static int hf_phy_attributes_num_repeat; +static int hf_phy_attributes_symbol_offset; +static int hf_phy_attributes_num_of_slots; +static int hf_phy_attributes_subchannel; static int dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len; -/* guint num_of_slots;*/ + unsigned offset = 0; + unsigned tvb_len; +/* unsigned num_of_slots;*/ proto_item *phy_item = NULL; proto_tree *phy_tree = NULL; @@ -98,7 +98,7 @@ static int dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pinf /* display the number of slots */ proto_tree_add_item(phy_tree, hf_phy_attributes_num_of_slots, tvb, offset, 2, ENC_BIG_ENDIAN); /* get the number of slots */ -/* num_of_slots = tvb_get_guint16(tvb, offset);*/ +/* num_of_slots = tvb_get_uint16(tvb, offset);*/ /* move to next field */ offset += 2; /* display the physical subchannel list */ @@ -151,7 +151,7 @@ void wimax_proto_register_wimax_phy_attributes(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_phy_attributes_decoder }; |