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-sit.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-sit.c')
| -rw-r--r-- | epan/dissectors/packet-dvb-sit.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/epan/dissectors/packet-dvb-sit.c b/epan/dissectors/packet-dvb-sit.c index 26b50ead..6ae583af 100644 --- a/epan/dissectors/packet-dvb-sit.c +++ b/epan/dissectors/packet-dvb-sit.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,23 +21,23 @@ void proto_reg_handoff_dvb_sit(void); static dissector_handle_t dvb_sit_handle; -static int proto_dvb_sit = -1; +static int proto_dvb_sit; -static int hf_dvb_sit_reserved_future_use1 = -1; -static int hf_dvb_sit_reserved = -1; -static int hf_dvb_sit_version_number = -1; -static int hf_dvb_sit_current_next_indicator = -1; -static int hf_dvb_sit_section_number = -1; -static int hf_dvb_sit_last_section_number = -1; -static int hf_dvb_sit_reserved_future_use2 = -1; -static int hf_dvb_sit_transmission_info_len = -1; -static int hf_dvb_sit_service_id = -1; -static int hf_dvb_sit_reserved_future_use3 = -1; -static int hf_dvb_sit_running_status = -1; -static int hf_dvb_sit_service_descriptors_length = -1; +static int hf_dvb_sit_reserved_future_use1; +static int hf_dvb_sit_reserved; +static int hf_dvb_sit_version_number; +static int hf_dvb_sit_current_next_indicator; +static int hf_dvb_sit_section_number; +static int hf_dvb_sit_last_section_number; +static int hf_dvb_sit_reserved_future_use2; +static int hf_dvb_sit_transmission_info_len; +static int hf_dvb_sit_service_id; +static int hf_dvb_sit_reserved_future_use3; +static int hf_dvb_sit_running_status; +static int hf_dvb_sit_service_descriptors_length; -static gint ett_dvb_sit = -1; -static gint ett_dvb_sit_service = -1; +static int ett_dvb_sit; +static int ett_dvb_sit_service; #define DVB_SIT_RESERVED_MASK 0xC0 #define DVB_SIT_VERSION_NUMBER_MASK 0x3E @@ -64,9 +65,9 @@ static int dissect_dvb_sit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0, length = 0; - guint descriptor_len; - guint16 svc_id; + unsigned offset = 0, length = 0; + unsigned descriptor_len; + uint16_t svc_id; proto_item *ti; proto_tree *dvb_sit_tree; @@ -199,7 +200,7 @@ proto_register_dvb_sit(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_dvb_sit, &ett_dvb_sit_service }; |