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 /epan/dissectors/packet-dvb-bat.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 'epan/dissectors/packet-dvb-bat.c')
| -rw-r--r-- | epan/dissectors/packet-dvb-bat.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c index 44db1f08..a95640e6 100644 --- a/epan/dissectors/packet-dvb-bat.c +++ b/epan/dissectors/packet-dvb-bat.c @@ -12,6 +12,7 @@ #include "config.h" #include <epan/packet.h> +#include <epan/tfs.h> #include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" @@ -20,27 +21,27 @@ void proto_reg_handoff_dvb_bat(void); static dissector_handle_t dvb_bat_handle; -static int proto_dvb_bat = -1; -static int hf_dvb_bat_bouquet_id = -1; -static int hf_dvb_bat_reserved1 = -1; -static int hf_dvb_bat_version_number = -1; -static int hf_dvb_bat_current_next_indicator = -1; -static int hf_dvb_bat_section_number = -1; -static int hf_dvb_bat_last_section_number = -1; +static int proto_dvb_bat; +static int hf_dvb_bat_bouquet_id; +static int hf_dvb_bat_reserved1; +static int hf_dvb_bat_version_number; +static int hf_dvb_bat_current_next_indicator; +static int hf_dvb_bat_section_number; +static int hf_dvb_bat_last_section_number; -static int hf_dvb_bat_reserved2 = -1; -static int hf_dvb_bat_bouquet_descriptors_length = -1; +static int hf_dvb_bat_reserved2; +static int hf_dvb_bat_bouquet_descriptors_length; -static int hf_dvb_bat_reserved3 = -1; -static int hf_dvb_bat_transport_stream_loop_length = -1; +static int hf_dvb_bat_reserved3; +static int hf_dvb_bat_transport_stream_loop_length; -static int hf_dvb_bat_transport_stream_id = -1; -static int hf_dvb_bat_original_network_id = -1; -static int hf_dvb_bat_reserved4 = -1; -static int hf_dvb_bat_transport_descriptors_length = -1; +static int hf_dvb_bat_transport_stream_id; +static int hf_dvb_bat_original_network_id; +static int hf_dvb_bat_reserved4; +static int hf_dvb_bat_transport_descriptors_length; -static gint ett_dvb_bat = -1; -static gint ett_dvb_bat_transport_stream = -1; +static int ett_dvb_bat; +static int ett_dvb_bat_transport_stream; #define DVB_BAT_RESERVED1_MASK 0xC0 @@ -80,8 +81,8 @@ static int dissect_dvb_bat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0, length = 0, ts_loop_end; - guint16 ts_id, descriptor_len, ts_loop_len; + unsigned offset = 0, length = 0, ts_loop_end; + uint16_t ts_id, descriptor_len, ts_loop_len; proto_item *ti; proto_tree *dvb_bat_tree; @@ -226,7 +227,7 @@ proto_register_dvb_bat(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_dvb_bat, &ett_dvb_bat_transport_stream }; |